Merge branch 'hotfix/v4.1.2'

.gitignore

@@ -8,6 +8,7 @@ apps/presentationeditor/embed/resources/less/node_modules
 apps/spreadsheeteditor/embed/resources/less/node_modules
 apps/documenteditor/mobile/resources/sass/.sass-cache
 apps/spreadsheeteditor/mobile/resources/sass/.sass-cache
+apps/presentationeditor/mobile/resources/sass/.sass-cache
 
 
 # test documents

Readme.md

@@ -1,4 +1,4 @@
-[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html)    ![Release](https://img.shields.io/badge/Release-v4.1.1-blue.svg?style=flat)
+[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html)    ![Release](https://img.shields.io/badge/Release-v4.1.2-blue.svg?style=flat)
 
 ## web-apps
 

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

@@ -201,7 +201,7 @@ define([
                         if (typeof value == 'object') {
                             _.each(value, function(obj) {
                                 if (typeof obj === 'string')
-                                    changetext += (' ' + obj);
+                                    changetext += (' ' + Common.Utils.String.htmlEncode(obj));
                                 else {
                                     switch (obj) {
                                         case 0:
@@ -220,7 +220,7 @@ define([
                                 }
                             })
                         } else if (typeof value === 'string') {
-                            changetext +=  (' ' + value);
+                            changetext +=  (' ' + Common.Utils.String.htmlEncode(value));
                         }
                     break;
                     case Asc.c_oAscRevisionsChangeType.TextRem:
@@ -228,7 +228,7 @@ define([
                         if (typeof value == 'object') {
                             _.each(value, function(obj) {
                                 if (typeof obj === 'string')
-                                    changetext += (' ' + obj);
+                                    changetext += (' ' + Common.Utils.String.htmlEncode(obj));
                                 else {
                                     switch (obj) {
                                         case 0:
@@ -247,7 +247,7 @@ define([
                                 }
                             })
                         } else if (typeof value === 'string') {
-                            changetext +=  (' ' + value);
+                            changetext +=  (' ' + Common.Utils.String.htmlEncode(value));
                         }
                     break;
                     case Asc.c_oAscRevisionsChangeType.ParaAdd:

apps/common/main/lib/template/Header.template

@@ -1,6 +1,7 @@
 <div id="header-container">
     <div id="header-logo"></div>
     <div id="header-caption"><div><%= headerCaption %></div></div>
+    <div id="header-developer" class="hidden"><div><%= headerDeveloper %></div></div>
     <div id="header-documentcaption"><%= documentCaption %></div>
     <div id="header-back" style="display: <%= canBack ? 'table-cell' : 'none' %>;"><div><%= textBack %></div></div>
 </div>

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

@@ -53,6 +53,7 @@ define([
         options : {
             branding: {},
             headerCaption: 'Default Caption',
+            headerDeveloper: 'DEVELOPER MODE',
             documentCaption: '',
             canBack: false
         },
@@ -77,6 +78,7 @@ define([
             this.options = this.options ? _({}).extend(this.options, options) : options;
 
             this.headerCaption      = this.options.headerCaption;
+            this.headerDeveloper    = this.txtHeaderDeveloper;
             this.documentCaption    = this.options.documentCaption;
             this.canBack            = this.options.canBack;
             this.branding           = this.options.customization;
@@ -85,6 +87,7 @@ define([
         render: function () {
             $(this.el).html(this.template({
                 headerCaption   : this.headerCaption,
+                headerDeveloper   : this.headerDeveloper,
                 documentCaption : Common.Utils.String.htmlEncode(this.documentCaption),
                 canBack         : this.canBack,
                 textBack        : this.textBack
@@ -219,7 +222,12 @@ define([
             }
         },
 
+        setDeveloperMode: function(mode) {
+            $('#header-developer').toggleClass('hidden', !mode);
+        },
+
         textBack: 'Go to Documents',
-        openNewTabText: 'Open in New Tab'
+        openNewTabText: 'Open in New Tab',
+        txtHeaderDeveloper: 'DEVELOPER MODE'
     }, Common.Views.Header || {}))
 });

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

@@ -104,15 +104,21 @@ define([
                 this.$window.find('.tool').hide();
                 this.$window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
                 if (this.type == Asc.c_oAscAdvancedOptionsID.DRM) {
-                    var me = this;
+                    this.inputPwd = new Common.UI.InputField({
-                    me.inputPwd = new Common.UI.InputField({
                         el: $('#id-password-txt'),
                         type: 'password',
                         allowBlank: false,
                         validateOnBlur: false
                     });
-                } else
+                    this.$window.find('input').on('keypress', _.bind(this.onKeyPress, this));
+                } else {
+                    var me = this;
                     this.initCodePages();
+                    this.onPrimary = function() {
+                        me.onBtnClick();
+                        return false;
+                    };
+                }
             }
         },
 
@@ -138,9 +144,9 @@ define([
             this.close();
         },
 
-        onPrimary: function() {
+        onKeyPress: function(event) {
+            if (event.keyCode == Common.UI.Keys.RETURN)
                 this.onBtnClick();
-            return false;
         },
 
         initCodePages: function () {

apps/common/main/resources/less/header.less

@@ -46,6 +46,34 @@
     }
 }
 
+#header-developer {
+    background-color: #ffb400;
+    padding-left: 15px + @app-header-height / 3;
+    & > div {
+        position: relative;
+        background-color: #ffb400;
+        color: #6e4e00 !important;
+        padding-right: 15px;
+        cursor: default;
+        z-index: 1;
+        white-space: nowrap;
+        height: @app-header-height;
+        line-height: @app-header-height;
+
+        &:after {
+            content: '';
+            position: absolute;
+            top: 0;
+            right: -@app-header-height / 2;
+            width: @app-header-height / 2;
+            height: @app-header-height;
+            border-top: @app-header-height / 2 solid transparent;
+            border-left: @app-header-height / 3 solid #ffb400;
+            border-bottom: @app-header-height / 2 solid transparent;
+        }
+    }
+}
+
 #header-documentcaption {
     width: 100%;
     max-width: 100px;

apps/common/mobile/lib/component/SettingsList.js

@@ -63,39 +63,5 @@ Ext.define('Common.component.SettingsList', {
                 }
             }
         )
-    },
-
-    //
-    // Workaround Sencha Touch bug
-    // See https://sencha.jira.com/browse/TOUCH-3718
-    //
-
-    findGroupHeaderIndices: function() {
-        var me = this,
-            store = me.getStore(),
-            storeLn = store.getCount(),
-            groups = store.getGroups(),
-            groupLn = groups.length,
-            headerIndices = me.headerIndices = {},
-            footerIndices = me.footerIndices = {},
-            i, previousIndex, firstGroupedRecord, storeIndex;
-
-
-        me.groups = groups;
-
-        for (i = 0; i < groupLn; i++) {
-            firstGroupedRecord = groups[i].children[0];
-            storeIndex = store.indexOf(firstGroupedRecord);
-            headerIndices[storeIndex] = true;
-
-            previousIndex = storeIndex - 1;
-            if (previousIndex >= 0) {
-                footerIndices[previousIndex] = true;
-            }
-        }
-
-        footerIndices[storeLn - 1] = true;
-
-        return headerIndices;
     }
 });

apps/common/mobile/resources/fonts/ios7/ios7.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG font generated by IcoMoon.
+<iconset grid="16"></iconset>
+</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="512" >
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
+<glyph unicode="&#x21;" d="M 236.48-16.76L 175.652,48.016L 357.208,223.24L 175.652,406.38L 236.48,463.236L 476.48,223.24 	z"  />
+<glyph unicode="&#x22;" d="M 203.884,223.992L 410.68,21.364L 357.32-32L 101.32,223.992L 357.32,480L 409.596,427.74 z"  />
+<glyph unicode="&#x20;" horiz-adv-x="256" />
+</font></defs></svg>

apps/common/mobile/resources/fonts/tizen/tizen-icon.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" d="" horiz-adv-x="512" />
+<glyph unicode="&#x61;" d="M877.714 256v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-804.571q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h804.571q14.857 0 25.714-10.857t10.857-25.714zM877.714 548.571v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-804.571q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h804.571q14.857 0 25.714-10.857t10.857-25.714zM877.714 841.143v-73.143q0-14.857-10.857-25.714t-25.714-10.857h-804.571q-14.857 0-25.714 10.857t-10.857 25.714v73.143q0 14.857 10.857 25.714t25.714 10.857h804.571q14.857 0 25.714-10.857t10.857-25.714z" horiz-adv-x="878" />
+<glyph unicode="&#x62;" d="M731.429 475.429v73.143q0 14.857-10.857 25.714t-25.714 10.857h-286.857l108 108q10.857 10.857 10.857 25.714t-10.857 25.714l-52 52q-10.286 10.286-25.714 10.286t-25.714-10.286l-258.857-258.857q-10.286-10.286-10.286-25.714t10.286-25.714l258.857-258.857q10.286-10.286 25.714-10.286t25.714 10.286l52 52q10.286 10.286 10.286 25.714t-10.286 25.714l-108 108h286.857q14.857 0 25.714 10.857t10.857 25.714zM877.714 512q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" horiz-adv-x="878" />
+<glyph unicode="&#x63;" d="M409.714 226.857l259.429 259.429q10.857 10.857 10.857 25.714t-10.857 25.714l-259.429 259.429q-10.857 10.857-25.714 10.857t-25.714-10.857l-58.286-58.286q-10.857-10.857-10.857-25.714t10.857-25.714l175.429-175.429-175.429-175.429q-10.857-10.857-10.857-25.714t10.857-25.714l58.286-58.286q10.857-10.857 25.714-10.857t25.714 10.857zM877.714 512q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" horiz-adv-x="878" />
+</font></defs></svg>

apps/common/mobile/resources/sass/_common-settingslist.scss

@@ -7,6 +7,10 @@
   }
 
   &.x-list-round.x-list-grouped {
+    .x-list-footer-wrap.x-list-item-tpl {
+      padding-bottom: 0;
+    }
+
     .x-list-header-wrap {
       .x-dock-horizontal {
         padding-top: 0;

apps/common/mobile/resources/sass/_common-settingspanel.scss

@@ -17,7 +17,7 @@
         position: absolute;
         width: $anchor-width;
         height: $anchor-height;
-        -webkit-mask: 0 0 theme_image($theme-name, "tip_top.png") no-repeat;
+        //-webkit-mask: 0 0 theme_image($theme-name, "tip_top.png") no-repeat;
         -webkit-mask-size: $anchor-width $anchor-height;
         @include background-gradient($base-color, color_stops(lighten($base-color, 15%), lighten($base-color, 13%)));
         top: 1px !important;
@@ -38,7 +38,7 @@
         position: absolute;
         width: $anchor-width;
         height: $anchor-height + .1em;
-        -webkit-mask: 0 0 theme_image($theme-name, "tip_bottom.png") no-repeat;
+        //-webkit-mask: 0 0 theme_image($theme-name, "tip_bottom.png") no-repeat;
         -webkit-mask-size: $anchor-width $anchor-height;
         @include background-gradient($base-color, color_stops($base-color, darken($base-color, 5%)));
         top: -1px !important;
@@ -104,6 +104,19 @@
   }
 
   .round {
-    @include border-radius($panel-border-radius);
+    @include border-radius($form-fieldset-radius);
+  }
+
+  // Hide group header
+  .x-list-header-wrap {
+    @include border-top-radius($form-fieldset-radius !important);
+
+    .x-innerhtml {
+      @include border-top-radius($form-fieldset-radius !important);
+    }
+  }
+
+  .x-list-header {
+    display: none;
   }
 }

apps/common/mobile/resources/sass/_common-toolbar.scss

@@ -9,6 +9,10 @@ $shadow-width: .065em; // Space between tip and its shadow
   $toolbar-border-color: darken($color, 50%);
   $toolbar-button-color: darken($color, 5%);
 
+  .x-toolbar {
+    background-color: transparent;
+  }
+
   .x-toolbar-#{$ui-label} {
     @if $ui-label == search {
       @include background-gradient($color, color_stops($color, lighten($color, 11%) 20%, lighten($color, 11%)));

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

@@ -963,12 +963,10 @@ define([
                 this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view';
 
                 this.appOptions.canBranding  = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object');
-                if (this.appOptions.canBranding) {
+                if (this.appOptions.canBranding)
-                    this.getApplication()
+                    this.getApplication().getController('Viewport').getView('Common.Views.Header').setBranding(this.editorConfig.customization);
-                        .getController('Viewport')
+
-                        .getView('Common.Views.Header')
+                params.asc_getTrial() && this.getApplication().getController('Viewport').getView('Common.Views.Header').setDeveloperMode(true);
-                        .setBranding(this.editorConfig.customization);
-                }
                 
                 this.applyModeCommonElements();
                 this.applyModeEditorElements();

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

@@ -442,14 +442,21 @@ define([
             this.paragraphControls.push(this.btnMultilevels);
             this.textOnlyControls.push(this.btnMultilevels);
 
+            var clone = function(source) {
+                var obj = {};
+                for (var prop in source)
+                    obj[prop] = (typeof(source[prop])=='object') ? clone(source[prop]) : source[prop];
+                return obj;
+            };
+
             this.mnuMarkersPicker = {
                 conf: {index:0},
                 selectByIndex: function (idx) {
                     this.conf.index = idx;
                 }
             };
-            this.mnuNumbersPicker = _.clone(this.mnuMarkersPicker);
+            this.mnuNumbersPicker = clone(this.mnuMarkersPicker);
-            this.mnuMultilevelPicker = _.clone(this.mnuMarkersPicker);
+            this.mnuMultilevelPicker = clone(this.mnuMarkersPicker);
 
             this.btnInsertTable = new Common.UI.Button({
                 id          : 'id-toolbar-btn-inserttable',
@@ -546,8 +553,8 @@ define([
                     this.conf.disabled = val;
                 }
             };
-            this.mnuPageNumCurrentPos = _.clone(this.mnuPageNumberPosPicker);
+            this.mnuPageNumCurrentPos = clone(this.mnuPageNumberPosPicker);
-            this.mnuInsertPageNum = _.clone(this.mnuPageNumberPosPicker);
+            this.mnuInsertPageNum = clone(this.mnuPageNumberPosPicker);
             this.paragraphControls.push(this.mnuPageNumCurrentPos);
             this.toolbarControls.push(this.btnEditHeader);
 
@@ -747,7 +754,7 @@ define([
                 setChecked: function(val) { this.conf.checked = val;},
                 isChecked: function () { return this.conf.checked; }
             };
-            this.btnFitWidth = _.clone(this.btnFitPage);
+            this.btnFitWidth = clone(this.btnFitPage);
             this.mnuZoom = {options: {value: 100}};
 
             this.btnAdvSettings = new Common.UI.Button({

apps/documenteditor/main/locale/de.json

@@ -86,6 +86,8 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Alle ersetzen",
   "Common.UI.SynchronizeTip.textDontShow": "Diese Meldung nicht mehr anzeigen",
   "Common.UI.SynchronizeTip.textSynchronize": "Das Dokument wurde von einem anderen Benutzer geändert.<br/>Bitte klicken hier, um Ihre Änderungen zu speichern und die Aktualisierungen neu zu laden.",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Standardfarben",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Designfarben",
   "Common.UI.Window.cancelButtonText": "Abbrechen",
   "Common.UI.Window.closeButtonText": "Schließen",
   "Common.UI.Window.noButtonText": "Nein",
@@ -156,7 +158,13 @@
   "Common.Views.OpenDialog.cancelButtonText": "Abbrechen",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Verschlüsselung ",
+  "Common.Views.OpenDialog.txtPassword": "Password",
   "Common.Views.OpenDialog.txtTitle": "%1-Optionen wählen",
+  "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
+  "Common.Views.PluginDlg.textLoading": "Loading",
+  "Common.Views.Plugins.strPlugins": "Plugins",
+  "Common.Views.Plugins.textLoading": "Loading",
+  "Common.Views.Plugins.textStart": "Start",
   "Common.Views.ReviewChanges.txtAccept": "Annehmen",
   "Common.Views.ReviewChanges.txtAcceptAll": "Alle Änderungen annehmen",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "Aktuelle Änderungen annehmen",
@@ -202,6 +210,7 @@
   "DE.Controllers.Main.errorUpdateVersion": "Die Dateiversion wurde geändert. Die Seite wird neu geladen.",
   "DE.Controllers.Main.errorUserDrop": "Kein Zugriff auf diese Datei ist möglich.",
   "DE.Controllers.Main.errorUsersExceed": "Die nach dem Zahlungsplan erlaubte Anzahl der Benutzer ist überschritten",
+  "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.",
   "DE.Controllers.Main.leavePageText": "Dieses Dokument enthält ungespeicherte Änderungen. Klicken Sie auf \"Auf dieser Seite bleiben\" und dann auf \"Speichern\", um sie zu speichern. Klicken Sie auf \"Diese Seite verlassen\", um alle nicht gespeicherten Änderungen zu verwerfen.\n",
   "DE.Controllers.Main.loadFontsTextText": "Daten werden geladen...",
   "DE.Controllers.Main.loadFontsTitleText": "Daten werden geladen",
@@ -216,6 +225,7 @@
   "DE.Controllers.Main.mailMergeLoadFileText": "Laden der Datenquellen...",
   "DE.Controllers.Main.mailMergeLoadFileTitle": "Laden der Datenquellen",
   "DE.Controllers.Main.notcriticalErrorTitle": "Achtung",
+  "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
   "DE.Controllers.Main.openTextText": "Dokument wird geöffnet",
   "DE.Controllers.Main.openTitleText": "Das Dokument wird geöffnet",
   "DE.Controllers.Main.printTextText": "Dokument wird ausgedruckt...",
@@ -223,6 +233,7 @@
   "DE.Controllers.Main.reloadButtonText": "Seite erneut laden\t",
   "DE.Controllers.Main.requestEditFailedMessageText": "Jemand bearbeitet dieses Dokument in diesem Moment. Bitte versuchen Sie es später erneut.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Zugriff verweigert",
+  "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
   "DE.Controllers.Main.savePreparingText": "Speichervorbereitung",
   "DE.Controllers.Main.savePreparingTitle": "Speichervorbereitung. Bitte warten...",
   "DE.Controllers.Main.saveTextText": "Dokument wird gespeichert...",
@@ -240,6 +251,7 @@
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version",
   "DE.Controllers.Main.textStrict": "Formaler Modus",
   "DE.Controllers.Main.textTryUndoRedo": "Undo/Redo Optionen sind  für den halbformalen Zusammenbearbeitungsmodus deaktiviert.<br>Klicken Sie auf den Button \"Formaler Modus\", um den formalen Zusammenbearbeitungsmodus zu aktivieren, um die Datei, ohne Störungen anderer Benutzer zu bearbeiten und die Änderungen erst nachdem Sie sie gespeichert haben, zu senden. Sie können zwischen den Zusammenbearbeitungsmodi mit der Hilfe der erweiterten Einstellungen von Editor umschalten.",
+  "DE.Controllers.Main.titleLicenseExp": "License expired",
   "DE.Controllers.Main.titleUpdateVersion": "Version wurde geändert",
   "DE.Controllers.Main.txtArt": "Hier den Text eingeben",
   "DE.Controllers.Main.txtBasicShapes": "Standardformen",
@@ -267,6 +279,7 @@
   "DE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen",
   "DE.Controllers.Main.warnBrowserIE9": "Die Applkation hat geringte Fähigkeiten in IE9. Nutzen Sie IE10 oder höher.",
   "DE.Controllers.Main.warnBrowserZoom": "Die aktuelle Zoom-Einstellung Ihres Webbrowsers wird nicht völlig unterstützt. Bitte stellen Sie die Standardeinstellung mithilfe der Tastenkombination Strg+0 wieder her.",
+  "DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "DE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
   "DE.Controllers.Statusbar.textHasChanges": "Neue Änderungen wurden zurückverfolgt",
@@ -829,7 +842,7 @@
   "DE.Views.DropcapSettingsAdvanced.textLeft": "Links",
   "DE.Views.DropcapSettingsAdvanced.textMargin": "Rand",
   "DE.Views.DropcapSettingsAdvanced.textMove": "Mit Text verschieben",
-  "DE.Views.DropcapSettingsAdvanced.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen",
+  "DE.Views.DropcapSettingsAdvanced.textNewColor": "Benutzerdefinierte Farbe",
   "DE.Views.DropcapSettingsAdvanced.textNone": "Kein",
   "DE.Views.DropcapSettingsAdvanced.textPage": "Seite",
   "DE.Views.DropcapSettingsAdvanced.textParagraph": "Absatz",
@@ -838,8 +851,6 @@
   "DE.Views.DropcapSettingsAdvanced.textRelative": "Im Bezug auf ",
   "DE.Views.DropcapSettingsAdvanced.textRight": "Rechts",
   "DE.Views.DropcapSettingsAdvanced.textRowHeight": "Höhe in Zeilen",
-  "DE.Views.DropcapSettingsAdvanced.textStandartColors": "Standardfarben",
-  "DE.Views.DropcapSettingsAdvanced.textThemeColors": "Designfarben",
   "DE.Views.DropcapSettingsAdvanced.textTitle": "Initialbuchstaben - Erweiterte Einstellungen",
   "DE.Views.DropcapSettingsAdvanced.textTitleFrame": "Rahmen - Erweiterte Einstellungen",
   "DE.Views.DropcapSettingsAdvanced.textTop": "Oben",
@@ -909,6 +920,8 @@
   "DE.Views.FileMenuPanels.Settings.textMinute": "Jede Minute",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Alle anzeigen",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Zentimeter",
+  "DE.Views.FileMenuPanels.Settings.txtFitPage": "Fit to Page",
+  "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Fit to Width",
   "DE.Views.FileMenuPanels.Settings.txtInch": "Zoll",
   "DE.Views.FileMenuPanels.Settings.txtInput": "Alternative Eingabe",
   "DE.Views.FileMenuPanels.Settings.txtLast": "Letzte anzeigen",
@@ -943,6 +956,8 @@
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Dieses Feld ist erforderlich",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Dieses Feld muss eine URL im Format \"http://www.example.com\" enthalten",
   "DE.Views.ImageSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
+  "DE.Views.ImageSettings.textEdit": "Edit",
+  "DE.Views.ImageSettings.textEditObject": "Edit Object",
   "DE.Views.ImageSettings.textFromFile": "Aus Datei",
   "DE.Views.ImageSettings.textFromUrl": "Aus URL",
   "DE.Views.ImageSettings.textHeight": "Höhe",
@@ -1026,6 +1041,7 @@
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Kommentare",
   "DE.Views.LeftMenu.tipFile": "Datei",
+  "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Suchen",
   "DE.Views.LeftMenu.tipSupport": "Feedback und Support",
   "DE.Views.LeftMenu.tipTitles": "Titel",
@@ -1107,9 +1123,7 @@
   "DE.Views.ParagraphSettings.textAuto": "Mehrfach",
   "DE.Views.ParagraphSettings.textBackColor": "Hintergrundfarbe",
   "DE.Views.ParagraphSettings.textExact": "Genau",
-  "DE.Views.ParagraphSettings.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen",
+  "DE.Views.ParagraphSettings.textNewColor": "Benutzerdefinierte Farbe",
-  "DE.Views.ParagraphSettings.textStandartColors": "Standardfarben",
-  "DE.Views.ParagraphSettings.textThemeColors": "Designfarben",
   "DE.Views.ParagraphSettings.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Abbrechen",
   "DE.Views.ParagraphSettingsAdvanced.noTabs": "Die festgelegten Registerkarten werden in diesem Feld erscheinen",
@@ -1143,19 +1157,17 @@
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Standardregisterkarte",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Effekte",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "Links",
-  "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen",
+  "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Benutzerdefinierte Farbe",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Position",
   "DE.Views.ParagraphSettingsAdvanced.textRemove": "Löschen",
   "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Alle löschen",
   "DE.Views.ParagraphSettingsAdvanced.textRight": "Rechts",
   "DE.Views.ParagraphSettingsAdvanced.textSet": "Angeben",
   "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Abstand",
-  "DE.Views.ParagraphSettingsAdvanced.textStandartColors": "Standardfarben",
   "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Zentriert",
   "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Links",
   "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Tabulatorposition",
   "DE.Views.ParagraphSettingsAdvanced.textTabRight": "Rechts",
-  "DE.Views.ParagraphSettingsAdvanced.textThemeColors": "Designfarben",
   "DE.Views.ParagraphSettingsAdvanced.textTitle": "Absatz - Erweiterte Einstellungen",
   "DE.Views.ParagraphSettingsAdvanced.textTop": "Oben",
   "DE.Views.ParagraphSettingsAdvanced.tipAll": "Äußere Rahmenlinie und alle inneren Linien festlegen",
@@ -1184,6 +1196,7 @@
   "DE.Views.ShapeSettings.strSize": "Größe",
   "DE.Views.ShapeSettings.strStroke": "Strich",
   "DE.Views.ShapeSettings.strTransparency": "Undurchsichtigkeit",
+  "DE.Views.ShapeSettings.strType": "Type",
   "DE.Views.ShapeSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
   "DE.Views.ShapeSettings.textBorderSizeErr": "Der eingegebene Wert ist falsch.<br>Bitte geben Sie einen Wert zwischen 0 pt und 1584 pt ein.",
   "DE.Views.ShapeSettings.textColor": "Farbfüllung",
@@ -1195,16 +1208,14 @@
   "DE.Views.ShapeSettings.textGradientFill": "Füllung mit Farbverlauf",
   "DE.Views.ShapeSettings.textImageTexture": "Bild oder Textur",
   "DE.Views.ShapeSettings.textLinear": "Linear",
-  "DE.Views.ShapeSettings.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen",
+  "DE.Views.ShapeSettings.textNewColor": "Benutzerdefinierte Farbe",
   "DE.Views.ShapeSettings.textNoFill": "Keine Füllung",
   "DE.Views.ShapeSettings.textPatternFill": "Muster",
   "DE.Views.ShapeSettings.textRadial": "Radial",
   "DE.Views.ShapeSettings.textSelectTexture": "Auswählen",
-  "DE.Views.ShapeSettings.textStandartColors": "Standardfarben",
   "DE.Views.ShapeSettings.textStretch": "Ausdehnung",
   "DE.Views.ShapeSettings.textStyle": "Stil",
   "DE.Views.ShapeSettings.textTexture": "Aus Textur",
-  "DE.Views.ShapeSettings.textThemeColors": "Designfarben",
   "DE.Views.ShapeSettings.textTile": "Kachel",
   "DE.Views.ShapeSettings.textWrap": "Textumbruch",
   "DE.Views.ShapeSettings.txtBehind": "Hinten",
@@ -1281,13 +1292,11 @@
   "DE.Views.TableSettings.textFirst": "Erste",
   "DE.Views.TableSettings.textHeader": "Kopfzeile",
   "DE.Views.TableSettings.textLast": "Letzte",
-  "DE.Views.TableSettings.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen",
+  "DE.Views.TableSettings.textNewColor": "Benutzerdefinierte Farbe",
   "DE.Views.TableSettings.textOK": "OK",
   "DE.Views.TableSettings.textRows": "Zeilen",
   "DE.Views.TableSettings.textSelectBorders": "Wählen Sie Rahmenlinien, auf die ein anderer Stil angewandt wird",
-  "DE.Views.TableSettings.textStandartColors": "Standardfarben",
   "DE.Views.TableSettings.textTemplate": "Vorlage auswählen",
-  "DE.Views.TableSettings.textThemeColors": "Designfarben",
   "DE.Views.TableSettings.textTotal": "Insgesamt",
   "DE.Views.TableSettings.textWrap": "Textumbruch",
   "DE.Views.TableSettings.textWrapNoneTooltip": "Inline-Tabelle",
@@ -1333,7 +1342,7 @@
   "DE.Views.TableSettingsAdvanced.textMargins": "Zellenränder",
   "DE.Views.TableSettingsAdvanced.textMeasure": "Maßeinheit in",
   "DE.Views.TableSettingsAdvanced.textMove": "Objekt mit Text verschieben",
-  "DE.Views.TableSettingsAdvanced.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen",
+  "DE.Views.TableSettingsAdvanced.textNewColor": "Benutzerdefinierte Farbe",
   "DE.Views.TableSettingsAdvanced.textOnlyCells": "Nur für gewählte Zellen",
   "DE.Views.TableSettingsAdvanced.textOptions": "Optionen",
   "DE.Views.TableSettingsAdvanced.textOverlap": "Überlappung zulassen",
@@ -1345,12 +1354,10 @@
   "DE.Views.TableSettingsAdvanced.textRight": "Rechts",
   "DE.Views.TableSettingsAdvanced.textRightOf": "rechts von",
   "DE.Views.TableSettingsAdvanced.textRightTooltip": "Rechts",
-  "DE.Views.TableSettingsAdvanced.textStandartColors": "Standardfarben",
   "DE.Views.TableSettingsAdvanced.textTable": "Tabelle",
   "DE.Views.TableSettingsAdvanced.textTableBackColor": "Tabellenhintergrund",
   "DE.Views.TableSettingsAdvanced.textTablePosition": "Tabellenposition",
   "DE.Views.TableSettingsAdvanced.textTableSize": "Größe der Tabelle",
-  "DE.Views.TableSettingsAdvanced.textThemeColors": "Designfarben",
   "DE.Views.TableSettingsAdvanced.textTitle": "Tabelle - Erweiterte Einstellungen",
   "DE.Views.TableSettingsAdvanced.textTop": "Oben",
   "DE.Views.TableSettingsAdvanced.textVertical": "Vertikal",
@@ -1381,20 +1388,19 @@
   "DE.Views.TextArtSettings.strSize": "Größe",
   "DE.Views.TextArtSettings.strStroke": "Strich",
   "DE.Views.TextArtSettings.strTransparency": "Undurchsichtigkeit",
+  "DE.Views.TextArtSettings.strType": "Type",
   "DE.Views.TextArtSettings.textBorderSizeErr": "Der eingegebene Wert ist falsch.<br>Bitte geben Sie einen Wert zwischen 0 pt und 1584 pt ein.",
   "DE.Views.TextArtSettings.textColor": "Farbfüllung",
   "DE.Views.TextArtSettings.textDirection": "Richtung",
   "DE.Views.TextArtSettings.textGradient": "Farbverlauf",
   "DE.Views.TextArtSettings.textGradientFill": "Füllung mit Farbverlauf",
   "DE.Views.TextArtSettings.textLinear": "Linear",
-  "DE.Views.TextArtSettings.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen",
+  "DE.Views.TextArtSettings.textNewColor": "Benutzerdefinierte Farbe",
   "DE.Views.TextArtSettings.textNoFill": "Keine Füllung",
   "DE.Views.TextArtSettings.textRadial": "Radial",
   "DE.Views.TextArtSettings.textSelectTexture": "Auswählen",
-  "DE.Views.TextArtSettings.textStandartColors": "Standardfarben",
   "DE.Views.TextArtSettings.textStyle": "Stil",
   "DE.Views.TextArtSettings.textTemplate": "Vorlage",
-  "DE.Views.TextArtSettings.textThemeColors": "Designfarben",
   "DE.Views.TextArtSettings.textTransform": "Transformieren\t",
   "DE.Views.TextArtSettings.txtNoBorders": "Keine Linie",
   "DE.Views.Toolbar.mniCustomTable": "Benutzerdefinierte Tabelle einfügen",
@@ -1434,6 +1440,7 @@
   "DE.Views.Toolbar.textInsTextArt": "Text Art einfügen",
   "DE.Views.Toolbar.textInText": "Im Text",
   "DE.Views.Toolbar.textItalic": "Kursiv",
+  "DE.Views.Toolbar.textLandscape": "Landscape",
   "DE.Views.Toolbar.textLeft": "Links: ",
   "DE.Views.Toolbar.textLine": "Linie",
   "DE.Views.Toolbar.textMarginsLast": " Benutzerdefiniert als letzte",
@@ -1442,7 +1449,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
   "DE.Views.Toolbar.textMarginsUsNormal": "Normal (US)",
   "DE.Views.Toolbar.textMarginsWide": "Breit",
-  "DE.Views.Toolbar.textNewColor": "Neue benutzerdefinierte Farbe hinzufügen",
+  "DE.Views.Toolbar.textNewColor": "Benutzerdefinierte Farbe",
   "DE.Views.Toolbar.textNextPage": "Nächste Seite",
   "DE.Views.Toolbar.textNone": "Kein",
   "DE.Views.Toolbar.textOddPage": "Ungerade Seite",
@@ -1450,8 +1457,8 @@
   "DE.Views.Toolbar.textPageSizeCustom": "Benutzerdefiniertes Seitenformat",
   "DE.Views.Toolbar.textPie": "Kreis",
   "DE.Views.Toolbar.textPoint": "Punkt",
+  "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRight": "Rechts: ",
-  "DE.Views.Toolbar.textStandartColors": "Standardfarben",
   "DE.Views.Toolbar.textStock": "Kurs",
   "DE.Views.Toolbar.textStrikeout": "Durchgestrichen",
   "DE.Views.Toolbar.textStyleMenuDelete": "Stil löschen\t",
@@ -1462,7 +1469,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Aus der Auswahl neu aktualisieren",
   "DE.Views.Toolbar.textSubscript": "Tiefgestellt",
   "DE.Views.Toolbar.textSuperscript": "Hochgestellt",
-  "DE.Views.Toolbar.textThemeColors": "Designfarben",
   "DE.Views.Toolbar.textTitleError": "Fehler",
   "DE.Views.Toolbar.textToCurrent": "An aktueller Position",
   "DE.Views.Toolbar.textTop": "Oben: ",

apps/documenteditor/main/locale/en.json

@@ -141,6 +141,7 @@
   "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients",
   "Common.Views.Header.openNewTabText": "Open in New Tab",
   "Common.Views.Header.textBack": "Go to Documents",
+  "Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
   "Common.Views.History.textHistoryHeader": "Back to Document",
   "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel",
   "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
@@ -158,13 +159,13 @@
   "Common.Views.OpenDialog.cancelButtonText": "Cancel",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Encoding ",
-  "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
   "Common.Views.OpenDialog.txtPassword": "Password",
+  "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
   "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
+  "Common.Views.PluginDlg.textLoading": "Loading",
   "Common.Views.Plugins.strPlugins": "Plugins",
   "Common.Views.Plugins.textLoading": "Loading",
   "Common.Views.Plugins.textStart": "Start",
-  "Common.Views.PluginDlg.textLoading": "Loading",
   "Common.Views.ReviewChanges.txtAccept": "Accept",
   "Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "Accept Current Change",
@@ -225,6 +226,7 @@
   "DE.Controllers.Main.mailMergeLoadFileText": "Loading Data Source...",
   "DE.Controllers.Main.mailMergeLoadFileTitle": "Loading Data Source",
   "DE.Controllers.Main.notcriticalErrorTitle": "Warning",
+  "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
   "DE.Controllers.Main.openTextText": "Opening document...",
   "DE.Controllers.Main.openTitleText": "Opening Document",
   "DE.Controllers.Main.printTextText": "Printing document...",
@@ -232,6 +234,7 @@
   "DE.Controllers.Main.reloadButtonText": "Reload Page",
   "DE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this document right now. Please try again later.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Access denied",
+  "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
   "DE.Controllers.Main.savePreparingText": "Preparing to save",
   "DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
   "DE.Controllers.Main.saveTextText": "Saving document...",
@@ -249,6 +252,7 @@
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version",
   "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.",
+  "DE.Controllers.Main.titleLicenseExp": "License expired",
   "DE.Controllers.Main.titleUpdateVersion": "Version changed",
   "DE.Controllers.Main.txtArt": "Your text here",
   "DE.Controllers.Main.txtBasicShapes": "Basic Shapes",
@@ -276,10 +280,9 @@
   "DE.Controllers.Main.uploadImageTitleText": "Uploading Image",
   "DE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher",
   "DE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.",
+  "DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "DE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
-  "DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
-  "DE.Controllers.Main.titleLicenseExp": "License expired",
   "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
   "DE.Controllers.Statusbar.textTrackChanges": "The document is opened with the Track Changes mode enabled",
   "DE.Controllers.Statusbar.zoomText": "Zoom {0}%",
@@ -628,7 +631,7 @@
   "DE.Views.ChartSettings.textLine": "Line Chart",
   "DE.Views.ChartSettings.textOriginalSize": "Default Size",
   "DE.Views.ChartSettings.textPie": "Pie Chart",
-  "DE.Views.ChartSettings.textPoint": "Point Chart",
+  "DE.Views.ChartSettings.textPoint": "XY (Scatter) Chart",
   "DE.Views.ChartSettings.textSize": "Size",
   "DE.Views.ChartSettings.textStock": "Stock Chart",
   "DE.Views.ChartSettings.textStyle": "Style",
@@ -918,6 +921,8 @@
   "DE.Views.FileMenuPanels.Settings.textMinute": "Every Minute",
   "DE.Views.FileMenuPanels.Settings.txtAll": "View All",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centimeter",
+  "DE.Views.FileMenuPanels.Settings.txtFitPage": "Fit to Page",
+  "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Fit to Width",
   "DE.Views.FileMenuPanels.Settings.txtInch": "Inch",
   "DE.Views.FileMenuPanels.Settings.txtInput": "Alternate Input",
   "DE.Views.FileMenuPanels.Settings.txtLast": "View Last",
@@ -1241,8 +1246,8 @@
   "DE.Views.Statusbar.textChangesPanel": "Changes Panel",
   "DE.Views.Statusbar.textTrackChanges": "Track Changes",
   "DE.Views.Statusbar.tipAccessRights": "Manage document access rights",
-  "DE.Views.Statusbar.tipFitPage": "Fit Page",
+  "DE.Views.Statusbar.tipFitPage": "Fit to Page",
-  "DE.Views.Statusbar.tipFitWidth": "Fit Width",
+  "DE.Views.Statusbar.tipFitWidth": "Fit to Width",
   "DE.Views.Statusbar.tipMoreUsers": "and %1 users.",
   "DE.Views.Statusbar.tipReview": "Review",
   "DE.Views.Statusbar.tipSetDocLang": "Set Document Language",
@@ -1422,8 +1427,8 @@
   "DE.Views.Toolbar.textCompactView": "View Compact Toolbar",
   "DE.Views.Toolbar.textContPage": "Continuous Page",
   "DE.Views.Toolbar.textEvenPage": "Even Page",
-  "DE.Views.Toolbar.textFitPage": "Fit Page",
+  "DE.Views.Toolbar.textFitPage": "Fit to Page",
-  "DE.Views.Toolbar.textFitWidth": "Fit Width",
+  "DE.Views.Toolbar.textFitWidth": "Fit to Width",
   "DE.Views.Toolbar.textHideLines": "Hide Rulers",
   "DE.Views.Toolbar.textHideStatusBar": "Hide Status Bar",
   "DE.Views.Toolbar.textHideTitleBar": "Hide Title Bar",
@@ -1452,7 +1457,7 @@
   "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
   "DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
   "DE.Views.Toolbar.textPie": "Pie Chart",
-  "DE.Views.Toolbar.textPoint": "Point Chart",
+  "DE.Views.Toolbar.textPoint": "XY (Scatter) Chart",
   "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRight": "Right: ",
   "DE.Views.Toolbar.textStock": "Stock Chart",

apps/documenteditor/main/locale/es.json

@@ -86,6 +86,8 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Reemplazar todo",
   "Common.UI.SynchronizeTip.textDontShow": "No volver a mostrar este mensaje",
   "Common.UI.SynchronizeTip.textSynchronize": "El documento ha sido cambiado por otro usuario.<br/>Por favor haga clic para guardar sus cambios y recargue las actualizaciones.",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Colores estándar",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Colores de tema",
   "Common.UI.Window.cancelButtonText": "Cancelar",
   "Common.UI.Window.closeButtonText": "Cerrar",
   "Common.UI.Window.noButtonText": "No",
@@ -156,7 +158,13 @@
   "Common.Views.OpenDialog.cancelButtonText": "Cancelar",
   "Common.Views.OpenDialog.okButtonText": "Aceptar",
   "Common.Views.OpenDialog.txtEncoding": "Codificación",
+  "Common.Views.OpenDialog.txtPassword": "Password",
   "Common.Views.OpenDialog.txtTitle": "Elegir opciones de %1",
+  "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
+  "Common.Views.PluginDlg.textLoading": "Loading",
+  "Common.Views.Plugins.strPlugins": "Plugins",
+  "Common.Views.Plugins.textLoading": "Loading",
+  "Common.Views.Plugins.textStart": "Start",
   "Common.Views.ReviewChanges.txtAccept": "Aceptar",
   "Common.Views.ReviewChanges.txtAcceptAll": "Aceptar Todos los Cambios",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "Aceptar Cambios Actuales",
@@ -202,6 +210,7 @@
   "DE.Controllers.Main.errorUpdateVersion": "Se ha cambiado la versión del archivo. La página será actualizada.",
   "DE.Controllers.Main.errorUserDrop": "No se puede acceder al archivo ahora.",
   "DE.Controllers.Main.errorUsersExceed": "El número de usuarios permitido según su plan de precios fue excedido",
+  "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.",
   "DE.Controllers.Main.leavePageText": "Hay cambios no guardados en este documento. Haga clic en 'Permanecer en esta página', después 'Guardar' para guardarlos. Haga clic en 'Abandonar esta página' para descartar todos los cambios no guardados.",
   "DE.Controllers.Main.loadFontsTextText": "Cargando datos...",
   "DE.Controllers.Main.loadFontsTitleText": "Cargando datos",
@@ -216,6 +225,7 @@
   "DE.Controllers.Main.mailMergeLoadFileText": "Cargando fuente de datos...",
   "DE.Controllers.Main.mailMergeLoadFileTitle": "Cargando fuente de datos",
   "DE.Controllers.Main.notcriticalErrorTitle": "Aviso",
+  "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
   "DE.Controllers.Main.openTextText": "Abriendo documento...",
   "DE.Controllers.Main.openTitleText": "Abriendo documento",
   "DE.Controllers.Main.printTextText": "Imprimiendo documento...",
@@ -223,6 +233,7 @@
   "DE.Controllers.Main.reloadButtonText": "Recargar página",
   "DE.Controllers.Main.requestEditFailedMessageText": "Alguien está editando este documento en este momento. Por favor, inténtelo de nuevo más tarde.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Acceso negado",
+  "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
   "DE.Controllers.Main.savePreparingText": "Preparando para guardar",
   "DE.Controllers.Main.savePreparingTitle": "Preparando para guardar.Espere por favor...",
   "DE.Controllers.Main.saveTextText": "Guardando documento...",
@@ -240,6 +251,7 @@
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version",
   "DE.Controllers.Main.textStrict": "Modo estricto",
   "DE.Controllers.Main.textTryUndoRedo": "Las funciones Anular/Rehacer se desactivan para el modo co-edición rápido.<br>Haga Clic en el botón \"modo estricto\" para cambiar al modo de co-edición estricta para editar el archivo sin la interferencia de otros usuarios y enviar sus cambios sólo después de guardarlos. Se puede cambiar entre los modos de co-edición usando los ajustes avanzados de edición.",
+  "DE.Controllers.Main.titleLicenseExp": "License expired",
   "DE.Controllers.Main.titleUpdateVersion": "Versión ha cambiado",
   "DE.Controllers.Main.txtArt": "Su texto aquí",
   "DE.Controllers.Main.txtBasicShapes": "Formas básicas",
@@ -267,6 +279,7 @@
   "DE.Controllers.Main.uploadImageTitleText": "Subiendo imagen",
   "DE.Controllers.Main.warnBrowserIE9": "Este aplicación tiene baja capacidad en IE9. Utilice IE10 o superior",
   "DE.Controllers.Main.warnBrowserZoom": "La configuración actual de zoom de su navegador no está soportada por completo. Por favor restablezca zoom predeterminado pulsando Ctrl+0.",
+  "DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "DE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado",
   "DE.Controllers.Statusbar.textHasChanges": "Nuevos cambios han sido encontrado",
@@ -838,8 +851,6 @@
   "DE.Views.DropcapSettingsAdvanced.textRelative": "En relación a\n",
   "DE.Views.DropcapSettingsAdvanced.textRight": "Derecho",
   "DE.Views.DropcapSettingsAdvanced.textRowHeight": "Altura en filas",
-  "DE.Views.DropcapSettingsAdvanced.textStandartColors": "Colores estándar",
-  "DE.Views.DropcapSettingsAdvanced.textThemeColors": "Colores de tema",
   "DE.Views.DropcapSettingsAdvanced.textTitle": "Letra capital - ajustes avanzados",
   "DE.Views.DropcapSettingsAdvanced.textTitleFrame": "Marco-ajustes avanzados",
   "DE.Views.DropcapSettingsAdvanced.textTop": "Superior",
@@ -909,6 +920,8 @@
   "DE.Views.FileMenuPanels.Settings.textMinute": "Cada minuto",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Ver todo",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centímetro",
+  "DE.Views.FileMenuPanels.Settings.txtFitPage": "Fit to Page",
+  "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Fit to Width",
   "DE.Views.FileMenuPanels.Settings.txtInch": "Pulgada",
   "DE.Views.FileMenuPanels.Settings.txtInput": "Entrada alternativa",
   "DE.Views.FileMenuPanels.Settings.txtLast": "Ver últimos",
@@ -943,6 +956,8 @@
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Este campo es obligatorio",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Este campo debe ser URL en el formato \"http://www.example.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Mostrar ajustes avanzados",
+  "DE.Views.ImageSettings.textEdit": "Edit",
+  "DE.Views.ImageSettings.textEditObject": "Edit Object",
   "DE.Views.ImageSettings.textFromFile": "De archivo",
   "DE.Views.ImageSettings.textFromUrl": "De URL",
   "DE.Views.ImageSettings.textHeight": "Altura",
@@ -1026,6 +1041,7 @@
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Comentarios",
   "DE.Views.LeftMenu.tipFile": "Archivo",
+  "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Búsqueda",
   "DE.Views.LeftMenu.tipSupport": "Feedback y Soporte",
   "DE.Views.LeftMenu.tipTitles": "Títulos",
@@ -1108,8 +1124,6 @@
   "DE.Views.ParagraphSettings.textBackColor": "Color de fondo",
   "DE.Views.ParagraphSettings.textExact": "Exacto",
   "DE.Views.ParagraphSettings.textNewColor": "Añadir Color Personalizado Nuevo",
-  "DE.Views.ParagraphSettings.textStandartColors": "Colores estándar",
-  "DE.Views.ParagraphSettings.textThemeColors": "Colores de tema",
   "DE.Views.ParagraphSettings.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Cancelar",
   "DE.Views.ParagraphSettingsAdvanced.noTabs": "Las pestañas especificadas aparecerán en este campo",
@@ -1150,12 +1164,10 @@
   "DE.Views.ParagraphSettingsAdvanced.textRight": "Derecho",
   "DE.Views.ParagraphSettingsAdvanced.textSet": "Especificar",
   "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Espaciado",
-  "DE.Views.ParagraphSettingsAdvanced.textStandartColors": "Colores estándar",
   "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Al centro",
   "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Izquierdo",
   "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Posición de tab",
   "DE.Views.ParagraphSettingsAdvanced.textTabRight": "Derecho",
-  "DE.Views.ParagraphSettingsAdvanced.textThemeColors": "Colores de tema",
   "DE.Views.ParagraphSettingsAdvanced.textTitle": "Párrafo - Ajustes avanzados",
   "DE.Views.ParagraphSettingsAdvanced.textTop": "Superior",
   "DE.Views.ParagraphSettingsAdvanced.tipAll": "Fijar borde exterior y todas líneas interiores ",
@@ -1184,6 +1196,7 @@
   "DE.Views.ShapeSettings.strSize": "Tamaño",
   "DE.Views.ShapeSettings.strStroke": "Trazo",
   "DE.Views.ShapeSettings.strTransparency": "Opacidad ",
+  "DE.Views.ShapeSettings.strType": "Type",
   "DE.Views.ShapeSettings.textAdvanced": "Mostrar ajustes avanzados",
   "DE.Views.ShapeSettings.textBorderSizeErr": "El valor numérico es incorrecto.<br>Por favor, introduzca un valor de 0 a 1584 puntos.",
   "DE.Views.ShapeSettings.textColor": "Color de relleno",
@@ -1200,11 +1213,9 @@
   "DE.Views.ShapeSettings.textPatternFill": "Patrón",
   "DE.Views.ShapeSettings.textRadial": "Radial",
   "DE.Views.ShapeSettings.textSelectTexture": "Seleccionar",
-  "DE.Views.ShapeSettings.textStandartColors": "Colores estándar",
   "DE.Views.ShapeSettings.textStretch": "Estirar",
   "DE.Views.ShapeSettings.textStyle": "Estilo",
   "DE.Views.ShapeSettings.textTexture": "De textura",
-  "DE.Views.ShapeSettings.textThemeColors": "Colores de tema",
   "DE.Views.ShapeSettings.textTile": "Mosaico",
   "DE.Views.ShapeSettings.textWrap": "Ajuste de texto",
   "DE.Views.ShapeSettings.txtBehind": "Detrás",
@@ -1285,9 +1296,7 @@
   "DE.Views.TableSettings.textOK": "Aceptar",
   "DE.Views.TableSettings.textRows": "Filas",
   "DE.Views.TableSettings.textSelectBorders": "Seleccione bordes que usted desea cambiar aplicando estilo seleccionado",
-  "DE.Views.TableSettings.textStandartColors": "Colores estándar",
   "DE.Views.TableSettings.textTemplate": "Seleccionar de plantilla",
-  "DE.Views.TableSettings.textThemeColors": "Colores de tema",
   "DE.Views.TableSettings.textTotal": "Total",
   "DE.Views.TableSettings.textWrap": "Ajuste de texto",
   "DE.Views.TableSettings.textWrapNoneTooltip": "Tabla en línea",
@@ -1345,12 +1354,10 @@
   "DE.Views.TableSettingsAdvanced.textRight": "Derecho",
   "DE.Views.TableSettingsAdvanced.textRightOf": "a la derecha de",
   "DE.Views.TableSettingsAdvanced.textRightTooltip": "Derecho",
-  "DE.Views.TableSettingsAdvanced.textStandartColors": "Colores estándar",
   "DE.Views.TableSettingsAdvanced.textTable": "Tabla",
   "DE.Views.TableSettingsAdvanced.textTableBackColor": "Fondo de tabla",
   "DE.Views.TableSettingsAdvanced.textTablePosition": "Posición de la tabla",
   "DE.Views.TableSettingsAdvanced.textTableSize": "Tamaño de tabla",
-  "DE.Views.TableSettingsAdvanced.textThemeColors": "Colores de tema",
   "DE.Views.TableSettingsAdvanced.textTitle": "Tabla - Ajustes avanzados",
   "DE.Views.TableSettingsAdvanced.textTop": "Superior",
   "DE.Views.TableSettingsAdvanced.textVertical": "Vertical",
@@ -1381,6 +1388,7 @@
   "DE.Views.TextArtSettings.strSize": "Tamaño",
   "DE.Views.TextArtSettings.strStroke": "Trazo",
   "DE.Views.TextArtSettings.strTransparency": "Opacidad ",
+  "DE.Views.TextArtSettings.strType": "Type",
   "DE.Views.TextArtSettings.textBorderSizeErr": "El valor numérico es incorrecto.<br>Por favor, introduzca un valor de 0 a 1584 puntos.",
   "DE.Views.TextArtSettings.textColor": "Color Fill",
   "DE.Views.TextArtSettings.textDirection": "Dirección ",
@@ -1391,10 +1399,8 @@
   "DE.Views.TextArtSettings.textNoFill": "Sin relleno",
   "DE.Views.TextArtSettings.textRadial": "Radial",
   "DE.Views.TextArtSettings.textSelectTexture": "Seleccionar",
-  "DE.Views.TextArtSettings.textStandartColors": "Colores estándar",
   "DE.Views.TextArtSettings.textStyle": "Estilo",
   "DE.Views.TextArtSettings.textTemplate": "Plantilla",
-  "DE.Views.TextArtSettings.textThemeColors": "Colores de tema",
   "DE.Views.TextArtSettings.textTransform": "Transformar",
   "DE.Views.TextArtSettings.txtNoBorders": "Sin línea",
   "DE.Views.Toolbar.mniCustomTable": "Insertar tabla personalizada",
@@ -1434,6 +1440,7 @@
   "DE.Views.Toolbar.textInsTextArt": "Insertar Texto de Arte",
   "DE.Views.Toolbar.textInText": "En texto",
   "DE.Views.Toolbar.textItalic": "Cursiva",
+  "DE.Views.Toolbar.textLandscape": "Landscape",
   "DE.Views.Toolbar.textLeft": "Izquierdo: ",
   "DE.Views.Toolbar.textLine": "Gráfico de líneas",
   "DE.Views.Toolbar.textMarginsLast": "último personalizado",
@@ -1450,8 +1457,8 @@
   "DE.Views.Toolbar.textPageSizeCustom": "Tamaño de página personalizado",
   "DE.Views.Toolbar.textPie": "Gráfico circular",
   "DE.Views.Toolbar.textPoint": "Gráfico de Punto",
+  "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRight": "Derecho: ",
-  "DE.Views.Toolbar.textStandartColors": "Colores estándar",
   "DE.Views.Toolbar.textStock": "De cotizaciones",
   "DE.Views.Toolbar.textStrikeout": "Tachado",
   "DE.Views.Toolbar.textStyleMenuDelete": "Eliminar estilo",
@@ -1462,7 +1469,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Actualizar de la selección",
   "DE.Views.Toolbar.textSubscript": "Subíndice",
   "DE.Views.Toolbar.textSuperscript": "Sobreíndice",
-  "DE.Views.Toolbar.textThemeColors": "Colores de tema",
   "DE.Views.Toolbar.textTitleError": "Error",
   "DE.Views.Toolbar.textToCurrent": "A la posición actual",
   "DE.Views.Toolbar.textTop": "Top: ",

apps/documenteditor/main/locale/fr.json

@@ -86,6 +86,8 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Remplacer tout",
   "Common.UI.SynchronizeTip.textDontShow": "N'afficher plus ce message",
   "Common.UI.SynchronizeTip.textSynchronize": "Le document a été modifié par un autre utilisateur.<br/>Cliquez pour enregistrer vos modifications et recharger les mises à jour.",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème",
   "Common.UI.Window.cancelButtonText": "Annuler",
   "Common.UI.Window.closeButtonText": "Fermer",
   "Common.UI.Window.noButtonText": "Non",
@@ -156,7 +158,13 @@
   "Common.Views.OpenDialog.cancelButtonText": "Annuler",
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtEncoding": "Codage ",
+  "Common.Views.OpenDialog.txtPassword": "Password",
   "Common.Views.OpenDialog.txtTitle": "Choisir %1 des options ",
+  "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
+  "Common.Views.PluginDlg.textLoading": "Loading",
+  "Common.Views.Plugins.strPlugins": "Plugins",
+  "Common.Views.Plugins.textLoading": "Loading",
+  "Common.Views.Plugins.textStart": "Start",
   "Common.Views.ReviewChanges.txtAccept": "Accepter",
   "Common.Views.ReviewChanges.txtAcceptAll": "Accepter toutes les modifications",
   "Common.Views.ReviewChanges.txtAcceptCurrent": "Accepter la modification actuelle",
@@ -202,6 +210,7 @@
   "DE.Controllers.Main.errorUpdateVersion": "La version du fichier a été changée. La page sera rechargée.",
   "DE.Controllers.Main.errorUserDrop": "Impossible d'accéder au fichier",
   "DE.Controllers.Main.errorUsersExceed": "Le nombre d'utilisateurs autorisés par le plan tarifaire a été dépassé",
+  "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.",
   "DE.Controllers.Main.leavePageText": "Vous avez des modifications non enregistrées dans ce document. Cliquez sur 'Rester sur cette page', ensuite sur 'Enregistrer' pour enregistrer les modifications. Cliquez sur 'Quitter cette page' pour annuler toutes les modifications non enregistrées.",
   "DE.Controllers.Main.loadFontsTextText": "Chargement des données...",
   "DE.Controllers.Main.loadFontsTitleText": "Chargement des données",
@@ -216,6 +225,7 @@
   "DE.Controllers.Main.mailMergeLoadFileText": "Chargement de la source des données...",
   "DE.Controllers.Main.mailMergeLoadFileTitle": "Chargement de la source des données",
   "DE.Controllers.Main.notcriticalErrorTitle": "Avertissement",
+  "DE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
   "DE.Controllers.Main.openTextText": "Ouverture du document...",
   "DE.Controllers.Main.openTitleText": "Ouverture du document",
   "DE.Controllers.Main.printTextText": "Impression d'un document...",
@@ -223,6 +233,7 @@
   "DE.Controllers.Main.reloadButtonText": "Recharger la page",
   "DE.Controllers.Main.requestEditFailedMessageText": "Quelqu'un est en train de modifier ce document. Veuillez réessayer plus tard.",
   "DE.Controllers.Main.requestEditFailedTitleText": "Accès refusé",
+  "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
   "DE.Controllers.Main.savePreparingText": "Préparation à l'enregistrement ",
   "DE.Controllers.Main.savePreparingTitle": "Préparation à l'enregistrement en cours. Veuillez patienter...",
   "DE.Controllers.Main.saveTextText": "Enregistrement du document...",
@@ -240,6 +251,7 @@
   "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version",
   "DE.Controllers.Main.textStrict": "Mode strict",
   "DE.Controllers.Main.textTryUndoRedo": "Les fonctions annuler/rétablir sont désactivées pour le mode de co-édition rapide.<br>Cliquez sur le bouton \"Mode strict\" pour passer au mode de la co-édition stricte pour modifier le fichier sans interférence d'autres utilisateurs et envoyer vos modifications seulement après que vous les enregistrez. Vous pouvez basculer entre les modes de co-édition à l'aide de paramètres avancés d'éditeur.",
+  "DE.Controllers.Main.titleLicenseExp": "License expired",
   "DE.Controllers.Main.titleUpdateVersion": "Version a été modifiée",
   "DE.Controllers.Main.txtArt": "Votre texte ici",
   "DE.Controllers.Main.txtBasicShapes": "Formes de base",
@@ -267,6 +279,7 @@
   "DE.Controllers.Main.uploadImageTitleText": "Chargement d'une image",
   "DE.Controllers.Main.warnBrowserIE9": "L'application est peu compatible avec IE9. Utilisez IE10 ou version plus récente",
   "DE.Controllers.Main.warnBrowserZoom": "Le paramètre actuel de zoom de votre navigateur n'est pas accepté. Veuillez rétablir le niveau de zoom par défaut en appuyant sur Ctrl+0.",
+  "DE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "DE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "DE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.",
   "DE.Controllers.Statusbar.textHasChanges": "Nouveaux changements ont été suivis",
@@ -829,7 +842,7 @@
   "DE.Views.DropcapSettingsAdvanced.textLeft": "A gauche",
   "DE.Views.DropcapSettingsAdvanced.textMargin": "Marge",
   "DE.Views.DropcapSettingsAdvanced.textMove": "Déplacer avec le texte",
-  "DE.Views.DropcapSettingsAdvanced.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "DE.Views.DropcapSettingsAdvanced.textNewColor": "Couleur Personnalisée",
   "DE.Views.DropcapSettingsAdvanced.textNone": "Aucune",
   "DE.Views.DropcapSettingsAdvanced.textPage": "Page",
   "DE.Views.DropcapSettingsAdvanced.textParagraph": "Paragraphe",
@@ -838,8 +851,6 @@
   "DE.Views.DropcapSettingsAdvanced.textRelative": "par rapport à",
   "DE.Views.DropcapSettingsAdvanced.textRight": "A droite",
   "DE.Views.DropcapSettingsAdvanced.textRowHeight": "Hauteur des lignes",
-  "DE.Views.DropcapSettingsAdvanced.textStandartColors": "Couleurs standard",
-  "DE.Views.DropcapSettingsAdvanced.textThemeColors": "Couleurs de thème",
   "DE.Views.DropcapSettingsAdvanced.textTitle": "Lettrine - Paramètres avancés",
   "DE.Views.DropcapSettingsAdvanced.textTitleFrame": "Cadre - Paramètres avancés",
   "DE.Views.DropcapSettingsAdvanced.textTop": "En haut",
@@ -909,6 +920,8 @@
   "DE.Views.FileMenuPanels.Settings.textMinute": "Chaque minute",
   "DE.Views.FileMenuPanels.Settings.txtAll": "Voir tout",
   "DE.Views.FileMenuPanels.Settings.txtCm": "Centimètre",
+  "DE.Views.FileMenuPanels.Settings.txtFitPage": "Fit to Page",
+  "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Fit to Width",
   "DE.Views.FileMenuPanels.Settings.txtInch": "Pouce",
   "DE.Views.FileMenuPanels.Settings.txtInput": "Entrée alternative",
   "DE.Views.FileMenuPanels.Settings.txtLast": "Voir le dernier",
@@ -943,6 +956,8 @@
   "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Ce champ est obligatoire",
   "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Ce champ doit être une URL au format \"http://www.example.com\"",
   "DE.Views.ImageSettings.textAdvanced": "Afficher les paramètres avancés",
+  "DE.Views.ImageSettings.textEdit": "Edit",
+  "DE.Views.ImageSettings.textEditObject": "Edit Object",
   "DE.Views.ImageSettings.textFromFile": "Depuis un fichier",
   "DE.Views.ImageSettings.textFromUrl": "D'une URL",
   "DE.Views.ImageSettings.textHeight": "Hauteur",
@@ -1026,6 +1041,7 @@
   "DE.Views.LeftMenu.tipChat": "Chat",
   "DE.Views.LeftMenu.tipComments": "Commentaires",
   "DE.Views.LeftMenu.tipFile": "Fichier",
+  "DE.Views.LeftMenu.tipPlugins": "Plugins",
   "DE.Views.LeftMenu.tipSearch": "Recherche",
   "DE.Views.LeftMenu.tipSupport": "Commentaires & assistance",
   "DE.Views.LeftMenu.tipTitles": "Titres",
@@ -1107,9 +1123,7 @@
   "DE.Views.ParagraphSettings.textAuto": "Plusieurs",
   "DE.Views.ParagraphSettings.textBackColor": "Couleur d'arrière-plan",
   "DE.Views.ParagraphSettings.textExact": "Exactement",
-  "DE.Views.ParagraphSettings.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "DE.Views.ParagraphSettings.textNewColor": "Couleur Personnalisée",
-  "DE.Views.ParagraphSettings.textStandartColors": "Couleurs standard",
-  "DE.Views.ParagraphSettings.textThemeColors": "Couleurs de thème",
   "DE.Views.ParagraphSettings.txtAutoText": "Auto",
   "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Annuler",
   "DE.Views.ParagraphSettingsAdvanced.noTabs": "Les onglets spécifiés s'affichent dans ce champ",
@@ -1143,19 +1157,17 @@
   "DE.Views.ParagraphSettingsAdvanced.textDefault": "Onglet par défaut",
   "DE.Views.ParagraphSettingsAdvanced.textEffects": "Effets",
   "DE.Views.ParagraphSettingsAdvanced.textLeft": "A gauche",
-  "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "DE.Views.ParagraphSettingsAdvanced.textNewColor": "Couleur Personnalisée",
   "DE.Views.ParagraphSettingsAdvanced.textPosition": "Position",
   "DE.Views.ParagraphSettingsAdvanced.textRemove": "Supprimer",
   "DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Supprimer tout",
   "DE.Views.ParagraphSettingsAdvanced.textRight": "A droite",
   "DE.Views.ParagraphSettingsAdvanced.textSet": "Spécifier",
   "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Espacement",
-  "DE.Views.ParagraphSettingsAdvanced.textStandartColors": "Couleurs standard",
   "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Centre",
   "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "A gauche",
   "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Position d'onglet",
   "DE.Views.ParagraphSettingsAdvanced.textTabRight": "A droite",
-  "DE.Views.ParagraphSettingsAdvanced.textThemeColors": "Couleurs de thème",
   "DE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraphe - Paramètres avancés",
   "DE.Views.ParagraphSettingsAdvanced.textTop": "En haut",
   "DE.Views.ParagraphSettingsAdvanced.tipAll": "Bordure extérieure et la totalité des lignes intérieures",
@@ -1184,6 +1196,7 @@
   "DE.Views.ShapeSettings.strSize": "Taille",
   "DE.Views.ShapeSettings.strStroke": "Trait",
   "DE.Views.ShapeSettings.strTransparency": "Opacité",
+  "DE.Views.ShapeSettings.strType": "Type",
   "DE.Views.ShapeSettings.textAdvanced": "Afficher les paramètres avancés",
   "DE.Views.ShapeSettings.textBorderSizeErr": "La valeur saisie est incorrecte. <br>Entrez une valeur de 0 à 1584 points.",
   "DE.Views.ShapeSettings.textColor": "Couleur de remplissage",
@@ -1195,16 +1208,14 @@
   "DE.Views.ShapeSettings.textGradientFill": "Remplissage en dégradé",
   "DE.Views.ShapeSettings.textImageTexture": "Image ou texture",
   "DE.Views.ShapeSettings.textLinear": "Linéaire",
-  "DE.Views.ShapeSettings.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "DE.Views.ShapeSettings.textNewColor": "Couleur Personnalisée",
   "DE.Views.ShapeSettings.textNoFill": "Pas de remplissage",
   "DE.Views.ShapeSettings.textPatternFill": "Modèle",
   "DE.Views.ShapeSettings.textRadial": "Radial",
   "DE.Views.ShapeSettings.textSelectTexture": "Sélectionner",
-  "DE.Views.ShapeSettings.textStandartColors": "Couleurs standard",
   "DE.Views.ShapeSettings.textStretch": "Étirement",
   "DE.Views.ShapeSettings.textStyle": "Style",
   "DE.Views.ShapeSettings.textTexture": "D'une texture",
-  "DE.Views.ShapeSettings.textThemeColors": "Couleurs de thème",
   "DE.Views.ShapeSettings.textTile": "Tuile",
   "DE.Views.ShapeSettings.textWrap": "Style d'habillage",
   "DE.Views.ShapeSettings.txtBehind": "Derrière",
@@ -1281,13 +1292,11 @@
   "DE.Views.TableSettings.textFirst": "Premier",
   "DE.Views.TableSettings.textHeader": "En-tête",
   "DE.Views.TableSettings.textLast": "Dernier",
-  "DE.Views.TableSettings.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "DE.Views.TableSettings.textNewColor": "Couleur Personnalisée",
   "DE.Views.TableSettings.textOK": "OK",
   "DE.Views.TableSettings.textRows": "Lignes",
   "DE.Views.TableSettings.textSelectBorders": "Sélectionnez les bordures à modifier en appliquant le style choisi ci-dessus",
-  "DE.Views.TableSettings.textStandartColors": "Couleurs standard",
   "DE.Views.TableSettings.textTemplate": "Sélectionner à partir d'un modèle",
-  "DE.Views.TableSettings.textThemeColors": "Couleurs de thème",
   "DE.Views.TableSettings.textTotal": "Total",
   "DE.Views.TableSettings.textWrap": "Habillage du texte",
   "DE.Views.TableSettings.textWrapNoneTooltip": "Tableau aligné",
@@ -1333,7 +1342,7 @@
   "DE.Views.TableSettingsAdvanced.textMargins": "Marges de la cellule",
   "DE.Views.TableSettingsAdvanced.textMeasure": "Mesure en",
   "DE.Views.TableSettingsAdvanced.textMove": "Déplacer avec le texte",
-  "DE.Views.TableSettingsAdvanced.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "DE.Views.TableSettingsAdvanced.textNewColor": "Couleur Personnalisée",
   "DE.Views.TableSettingsAdvanced.textOnlyCells": "Seulement pour des cellules sélectionnées",
   "DE.Views.TableSettingsAdvanced.textOptions": "Options",
   "DE.Views.TableSettingsAdvanced.textOverlap": "Autoriser le chevauchement",
@@ -1345,12 +1354,10 @@
   "DE.Views.TableSettingsAdvanced.textRight": "A droite",
   "DE.Views.TableSettingsAdvanced.textRightOf": "à droite de",
   "DE.Views.TableSettingsAdvanced.textRightTooltip": "A droite",
-  "DE.Views.TableSettingsAdvanced.textStandartColors": "Couleurs standard",
   "DE.Views.TableSettingsAdvanced.textTable": "Tableau",
   "DE.Views.TableSettingsAdvanced.textTableBackColor": "Tableau de fond",
   "DE.Views.TableSettingsAdvanced.textTablePosition": "Position du tableau",
   "DE.Views.TableSettingsAdvanced.textTableSize": "Taille du tableau",
-  "DE.Views.TableSettingsAdvanced.textThemeColors": "Couleurs de thème",
   "DE.Views.TableSettingsAdvanced.textTitle": "Tableau - Paramètres avancés",
   "DE.Views.TableSettingsAdvanced.textTop": "En haut",
   "DE.Views.TableSettingsAdvanced.textVertical": "Vertical",
@@ -1381,20 +1388,19 @@
   "DE.Views.TextArtSettings.strSize": "Size",
   "DE.Views.TextArtSettings.strStroke": "Trait",
   "DE.Views.TextArtSettings.strTransparency": "Opacité",
+  "DE.Views.TextArtSettings.strType": "Type",
   "DE.Views.TextArtSettings.textBorderSizeErr": "La valeur saisie est incorrecte. <br>Entrez une valeur de 0 à 1584 points.",
   "DE.Views.TextArtSettings.textColor": "Couleur de remplissage",
   "DE.Views.TextArtSettings.textDirection": "Direction",
   "DE.Views.TextArtSettings.textGradient": "Dégradé",
   "DE.Views.TextArtSettings.textGradientFill": "Remplissage en dégradé",
   "DE.Views.TextArtSettings.textLinear": "Linéaire",
-  "DE.Views.TextArtSettings.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "DE.Views.TextArtSettings.textNewColor": "Couleur Personnalisée",
   "DE.Views.TextArtSettings.textNoFill": "Pas de remplissage",
   "DE.Views.TextArtSettings.textRadial": "Radial",
   "DE.Views.TextArtSettings.textSelectTexture": "Sélectionner",
-  "DE.Views.TextArtSettings.textStandartColors": "Couleurs standard",
   "DE.Views.TextArtSettings.textStyle": "Style",
   "DE.Views.TextArtSettings.textTemplate": "Modèle",
-  "DE.Views.TextArtSettings.textThemeColors": "Couleurs de thème",
   "DE.Views.TextArtSettings.textTransform": "Transformer",
   "DE.Views.TextArtSettings.txtNoBorders": "Pas de ligne",
   "DE.Views.Toolbar.mniCustomTable": "Inserer tableau personnalisé",
@@ -1434,6 +1440,7 @@
   "DE.Views.Toolbar.textInsTextArt": "Insérer le texte Art",
   "DE.Views.Toolbar.textInText": "Dans le Texte",
   "DE.Views.Toolbar.textItalic": "Italique",
+  "DE.Views.Toolbar.textLandscape": "Landscape",
   "DE.Views.Toolbar.textLeft": "À gauche:",
   "DE.Views.Toolbar.textLine": "Graphique en ligne",
   "DE.Views.Toolbar.textMarginsLast": "Dernière mesure",
@@ -1442,7 +1449,7 @@
   "DE.Views.Toolbar.textMarginsNormal": "Normal",
   "DE.Views.Toolbar.textMarginsUsNormal": "US normale",
   "DE.Views.Toolbar.textMarginsWide": "Large",
-  "DE.Views.Toolbar.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "DE.Views.Toolbar.textNewColor": "Couleur Personnalisée",
   "DE.Views.Toolbar.textNextPage": "Page suivante",
   "DE.Views.Toolbar.textNone": "Aucune",
   "DE.Views.Toolbar.textOddPage": "Page impaire",
@@ -1450,8 +1457,8 @@
   "DE.Views.Toolbar.textPageSizeCustom": "Taille de page personnalisé",
   "DE.Views.Toolbar.textPie": "Graphiques à secteurs",
   "DE.Views.Toolbar.textPoint": "Diagramme de dispersion",
+  "DE.Views.Toolbar.textPortrait": "Portrait",
   "DE.Views.Toolbar.textRight": "A droite: ",
-  "DE.Views.Toolbar.textStandartColors": "Couleurs standard",
   "DE.Views.Toolbar.textStock": "Graphique d'état de stocks",
   "DE.Views.Toolbar.textStrikeout": "Barré",
   "DE.Views.Toolbar.textStyleMenuDelete": "Supprimer le style",
@@ -1462,7 +1469,6 @@
   "DE.Views.Toolbar.textStyleMenuUpdate": "Mise à jour de la sélection",
   "DE.Views.Toolbar.textSubscript": "Indice",
   "DE.Views.Toolbar.textSuperscript": "Exposant",
-  "DE.Views.Toolbar.textThemeColors": "Couleurs de thème",
   "DE.Views.Toolbar.textTitleError": "Erreur",
   "DE.Views.Toolbar.textToCurrent": "A la position actuelle",
   "DE.Views.Toolbar.textTop": "En haut: ",

apps/documenteditor/mobile/app/controller/Main.js

@@ -209,6 +209,7 @@ Ext.define('DE.controller.Main', {
 
     onLongActionEnd: function(type) {
         Ext.Viewport.unmask();
+        Common.Gateway.setDocumentModified(this.api.isDocumentModified());
     },
 
     onError: function(id, level, errData) {

apps/documenteditor/mobile/app/controller/toolbar/Edit.js

@@ -130,6 +130,24 @@ Ext.define('DE.controller.toolbar.Edit', {
             }
         }, this);
 
+        if (Ext.os.is.iOS) {
+            Ext.each(Ext.ComponentQuery.query('button'), function(button) {
+                button.element.dom.ontouchstart = Ext.emptyFn();
+                button.element.dom.ontouchmove = Ext.emptyFn();
+                button.element.dom.ontouchend = Ext.emptyFn();
+            }, this);
+
+            Ext.each(Ext.ComponentQuery.query('toolbar'), function(toolbar) {
+                var preventFn = function(e){
+                    e.preventDefault();
+                };
+
+                toolbar.element.dom.ontouchstart = preventFn;
+                toolbar.element.dom.ontouchmove = preventFn;
+                toolbar.element.dom.ontouchend = preventFn;
+            }, this);
+        }
+
         Common.Gateway.on('init', Ext.bind(this.loadConfig, this));
     },
 
@@ -148,6 +166,7 @@ Ext.define('DE.controller.toolbar.Edit', {
             this.api.asc_registerCallback('asc_onCanUndo',                  Ext.bind(this.onApiCanUndo, this));
             this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',    Ext.bind(this.onCoAuthoringDisconnect, this));
             this.api.asc_registerCallback('asc_onDocumentModifiedChanged',  Ext.bind(this.onApiDocumentModified, this));
+            this.api.asc_registerCallback('asc_onDocumentCanSaveChanged',   Ext.bind(this.onApiDocumentCanSaveChanged, this));
         }
     },
 
@@ -181,7 +200,7 @@ Ext.define('DE.controller.toolbar.Edit', {
     },
 
     onApiDocumentModified: function() {
-        var isModified = this.api.isDocumentModified();
+        var isModified = this.api.asc_isDocumentCanSave();
         if (this.isDocModified !== isModified) {
             if (this.getSaveButton()) {
                 this.getSaveButton().setDisabled(!isModified);
@@ -192,6 +211,12 @@ Ext.define('DE.controller.toolbar.Edit', {
         }
     },
 
+    onApiDocumentCanSaveChanged: function (isCanSave) {
+        if (this.getSaveButton()) {
+            this.getSaveButton().setDisabled(!isCanSave);
+        }
+    },
+
     showToolbarPanel: function(panel, button){
         if (panel && button){
             panel.on('hide', Ext.bind(function(){
@@ -240,6 +265,8 @@ Ext.define('DE.controller.toolbar.Edit', {
 
     onTapSave: function() {
         this.api && this.api.asc_Save();
+        this.getSaveButton().setDisabled(true);
+
         Common.component.Analytics.trackEvent('ToolBar', 'Save');
     },
 

apps/documenteditor/mobile/app/controller/toolbar/View.js

@@ -87,6 +87,24 @@ Ext.define('DE.controller.toolbar.View', {
     launch: function() {
         this.callParent(arguments);
 
+        if (Ext.os.is.iOS) {
+            Ext.each(Ext.ComponentQuery.query('button'), function(button) {
+                button.element.dom.ontouchstart = Ext.emptyFn();
+                button.element.dom.ontouchmove = Ext.emptyFn();
+                button.element.dom.ontouchend = Ext.emptyFn();
+            }, this);
+
+            Ext.each(Ext.ComponentQuery.query('toolbar'), function(toolbar) {
+                var preventFn = function(e){
+                    e.preventDefault();
+                };
+
+                toolbar.element.dom.ontouchstart = preventFn;
+                toolbar.element.dom.ontouchmove = preventFn;
+                toolbar.element.dom.ontouchend = preventFn;
+            }, this);
+        }
+
         Common.Gateway.on('init',           Ext.bind(this.loadConfig, this));
         Common.Gateway.on('opendocument',   Ext.bind(this.loadDocument, this));
         Common.Gateway.on('applyeditrights',Ext.bind(this.onApplyEditRights, this));

apps/documenteditor/mobile/resources/sass/_application-base.scss

@@ -33,18 +33,36 @@ $outline-icon-size          : 74px;
 $outline-icon-image-width   : 148px;
 $outline-icon-image-height  : 222px;
 
-@import 'sencha-touch/default/all';
+@import 'sencha-touch/default';
 
-@include sencha-panel;
+@import 'sencha-touch/default/src/Class';
-@include sencha-buttons;
+@import 'sencha-touch/default/src/Button';
-@include sencha-toolbar;
+@import 'sencha-touch/default/src/Panel';
-@include sencha-toolbar-forms;
+@import 'sencha-touch/default/src/Sheet';
-@include sencha-indexbar;
+@import 'sencha-touch/default/src/MessageBox';
-@include sencha-list;
+@import 'sencha-touch/default/src/Toolbar';
-@include sencha-layout;
+@import 'sencha-touch/default/src/Toast';
-@include sencha-form;
+@import 'sencha-touch/default/src/Menu';
-@include sencha-msgbox;
+//@import 'sencha-touch/default/src/carousel/Carousel';
-@include sencha-loading-spinner;
+@import 'sencha-touch/default/src/form/Panel';
+@import 'sencha-touch/default/src/form/FieldSet';
+@import 'sencha-touch/default/src/field/Field';
+@import 'sencha-touch/default/src/field/Checkbox';
+@import 'sencha-touch/default/src/field/Radio';
+@import 'sencha-touch/default/src/field/Search';
+@import 'sencha-touch/default/src/field/Select';
+//@import 'sencha-touch/default/src/field/Slider';
+@import 'sencha-touch/default/src/field/Spinner';
+//@import 'sencha-touch/default/src/field/TextArea';
+//@import 'sencha-touch/default/src/dataview/IndexBar';
+@import 'sencha-touch/default/src/dataview/List';
+@import 'sencha-touch/default/src/picker/Picker';
+//@import 'sencha-touch/default/src/plugin/ListPaging';
+//@import 'sencha-touch/default/src/plugin/PullRefresh';
+//@import 'sencha-touch/default/src/slider/Slider';
+@import 'sencha-touch/default/src/slider/Toggle';
+//@import 'sencha-touch/default/src/tab/Panel';
+//@import 'sencha-touch/default/src/grid/Grid';
 
 @import 'common-buttons';
 @import 'common-dataview';

apps/documenteditor/mobile/resources/sass/config-debug.rb

@@ -2,7 +2,7 @@
 dir = File.dirname(__FILE__)
 
 # Load the sencha-touch framework automatically.
-load File.join(dir, '..', '..', '..', '..', '..', '3rdparty', 'touch', 'resources', 'themes')
+load File.join(dir, '..', '..', '..', '..', '..', 'vendor', 'touch', 'resources', 'themes')
 
 # Add include path for command styles
 add_import_path File.join(dir, '..', '..', '..', '..', '..', 'apps', 'common', 'mobile', 'resources', 'sass')

apps/documenteditor/mobile/resources/sass/config.rb

@@ -2,7 +2,7 @@
 dir = File.dirname(__FILE__)
 
 # Load the sencha-touch framework automatically.
-load File.join(dir, '..', '..', '..', '..', '..', '3rdparty', 'touch', 'resources', 'themes')
+load File.join(dir, '..', '..', '..', '..', '..', 'vendor', 'touch', 'resources', 'themes')
 
 # Add include path for command styles
 add_import_path File.join(dir, '..', '..', '..', '..', '..', 'apps', 'common', 'mobile', 'resources', 'sass')
@@ -10,5 +10,6 @@ add_import_path File.join(dir, '..', '..', '..', '..', '..', 'apps', 'common', '
 # Compass configurations
 sass_path    = dir
 css_path     = File.join(dir, "..", "css")
+fonts_path   = File.join(dir, '..', '..', '..', '..', '..', 'apps', 'common', 'mobile', 'resources', 'fonts')
 environment  = :production
 output_style = :compressed

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

@@ -742,12 +742,10 @@ define([
                 this._state.licenseWarning = (licType===Asc.c_oLicenseResult.Connections) && this.appOptions.canEdit && this.editorConfig.mode !== 'view';
 
                 this.appOptions.canBranding  = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object');
-                if (this.appOptions.canBranding) {
+                if (this.appOptions.canBranding)
-                    this.getApplication()
+                    this.getApplication().getController('Viewport').getView('Common.Views.Header').setBranding(this.editorConfig.customization);
-                        .getController('Viewport')
+
-                        .getView('Common.Views.Header')
+                params.asc_getTrial() && this.getApplication().getController('Viewport').getView('Common.Views.Header').setDeveloperMode(true);
-                        .setBranding(this.editorConfig.customization);
-                }
 
                 this.applyModeCommonElements();
                 this.applyModeEditorElements();

apps/presentationeditor/main/locale/de.json

@@ -28,6 +28,8 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Alle ersetzen",
   "Common.UI.SynchronizeTip.textDontShow": "Diese Meldung nicht mehr anzeigen",
   "Common.UI.SynchronizeTip.textSynchronize": "Das Dokument wurde von einem anderen Benutzer geändert.<br/>Bitte speichern Sie Ihre Änderungen und aktualisieren Sie Ihre Seite.",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Standardfarben",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Designfarben",
   "Common.UI.Window.cancelButtonText": "Abbrechen",
   "Common.UI.Window.closeButtonText": "Schließen",
   "Common.UI.Window.noButtonText": "Nein",
@@ -215,6 +217,7 @@
   "PE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen",
   "PE.Controllers.Main.warnBrowserIE9": "Die Anwendung hat geringe Fähigkeiten in IE9. Nutzen Sie IE10 oder höher.",
   "PE.Controllers.Main.warnBrowserZoom": "Die aktuelle Zoom-Einstellung Ihres Webbrowsers wird nicht völlig unterstützt. Bitte stellen Sie die Standardeinstellung mithilfe der Tastenkombination Strg+0 wieder her.",
+  "PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "PE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
   "PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
@@ -371,6 +374,7 @@
   "PE.Views.FileMenuPanels.Settings.txtAll": "Alle anzeigen",
   "PE.Views.FileMenuPanels.Settings.txtCm": "Zentimeter",
   "PE.Views.FileMenuPanels.Settings.txtFitSlide": "Folie anpassen",
+  "PE.Views.FileMenuPanels.Settings.txtFitWidth": "Fit to Width",
   "PE.Views.FileMenuPanels.Settings.txtInch": "Zoll",
   "PE.Views.FileMenuPanels.Settings.txtInput": "Eingabe ändern",
   "PE.Views.FileMenuPanels.Settings.txtLast": "Letzte anzeigen",
@@ -397,6 +401,8 @@
   "PE.Views.HyperlinkSettingsDialog.txtPrev": "Vorherige Folie",
   "PE.Views.HyperlinkSettingsDialog.txtSlide": "Folie",
   "PE.Views.ImageSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
+  "PE.Views.ImageSettings.textEdit": "Edit",
+  "PE.Views.ImageSettings.textEditObject": "Edit Object",
   "PE.Views.ImageSettings.textFromFile": "Aus Datei",
   "PE.Views.ImageSettings.textFromUrl": "Aus URL",
   "PE.Views.ImageSettings.textHeight": "Höhe",
@@ -417,6 +423,7 @@
   "PE.Views.LeftMenu.tipChat": "Chat",
   "PE.Views.LeftMenu.tipComments": "Kommentare",
   "PE.Views.LeftMenu.tipFile": "Datei",
+  "PE.Views.LeftMenu.tipPlugins": "Plugins",
   "PE.Views.LeftMenu.tipSearch": "Suche",
   "PE.Views.LeftMenu.tipSlides": "Folien",
   "PE.Views.LeftMenu.tipSupport": "Feedback und Support",
@@ -474,6 +481,7 @@
   "PE.Views.ShapeSettings.strSize": "Größe",
   "PE.Views.ShapeSettings.strStroke": "Strich",
   "PE.Views.ShapeSettings.strTransparency": "Undurchsichtigkeit",
+  "PE.Views.ShapeSettings.strType": "Type",
   "PE.Views.ShapeSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
   "PE.Views.ShapeSettings.textBorderSizeErr": "Der eingegebene Wert ist falsch.<br>Bitte geben Sie einen Wert zwischen 0 pt und 1584 pt ein.",
   "PE.Views.ShapeSettings.textColor": "Farbfüllung",
@@ -490,11 +498,9 @@
   "PE.Views.ShapeSettings.textPatternFill": "Muster",
   "PE.Views.ShapeSettings.textRadial": "Radial",
   "PE.Views.ShapeSettings.textSelectTexture": "Wählen",
-  "PE.Views.ShapeSettings.textStandartColors": "Standardfarben",
   "PE.Views.ShapeSettings.textStretch": "Ausdehnung",
   "PE.Views.ShapeSettings.textStyle": "Stil",
   "PE.Views.ShapeSettings.textTexture": "Aus Textur",
-  "PE.Views.ShapeSettings.textThemeColors": "Designfarben",
   "PE.Views.ShapeSettings.textTile": "Kachel",
   "PE.Views.ShapeSettings.txtBrownPaper": "Kraftpapier",
   "PE.Views.ShapeSettings.txtCanvas": "Canvas",
@@ -580,11 +586,9 @@
   "PE.Views.SlideSettings.textSelectTexture": "Wählen",
   "PE.Views.SlideSettings.textSmoothly": "Gleitend",
   "PE.Views.SlideSettings.textSplit": "Aufteilen",
-  "PE.Views.SlideSettings.textStandartColors": "Standardfarben",
   "PE.Views.SlideSettings.textStretch": "Ausdehnung",
   "PE.Views.SlideSettings.textStyle": "Stil",
   "PE.Views.SlideSettings.textTexture": "Aus Textur",
-  "PE.Views.SlideSettings.textThemeColors": "Designfarben",
   "PE.Views.SlideSettings.textTile": "Kachel",
   "PE.Views.SlideSettings.textTop": "Oben",
   "PE.Views.SlideSettings.textTopLeft": "Oben links",
@@ -609,9 +613,16 @@
   "PE.Views.SlideSettings.txtLeather": "Leder",
   "PE.Views.SlideSettings.txtPapyrus": "Papyrus",
   "PE.Views.SlideSettings.txtWood": "Holz",
+  "PE.Views.SlideshowSettings.cancelButtonText": "Cancel",
+  "PE.Views.SlideshowSettings.okButtonText": "Ok",
+  "PE.Views.SlideshowSettings.textLoop": "Loop continuously until 'Esc' is pressed",
+  "PE.Views.SlideshowSettings.textTitle": "Show Settings",
   "PE.Views.SlideSizeSettings.cancelButtonText": "Abbrechen",
   "PE.Views.SlideSizeSettings.okButtonText": "OK",
+  "PE.Views.SlideSizeSettings.strLandscape": "Landscape",
+  "PE.Views.SlideSizeSettings.strPortrait": "Portrait",
   "PE.Views.SlideSizeSettings.textHeight": "Höhe",
+  "PE.Views.SlideSizeSettings.textSlideOrientation": "Slide Orientation",
   "PE.Views.SlideSizeSettings.textSlideSize": "Foliengröße",
   "PE.Views.SlideSizeSettings.textTitle": "Einstellungen der Foliengröße",
   "PE.Views.SlideSizeSettings.textWidth": "Breite",
@@ -671,9 +682,7 @@
   "PE.Views.TableSettings.textNewColor": "Benutzerdefinierte Farbe",
   "PE.Views.TableSettings.textRows": "Zeilen",
   "PE.Views.TableSettings.textSelectBorders": "Wählen Sie die Rahmenlinien, auf die ein anderer Stil angewandt wird",
-  "PE.Views.TableSettings.textStandartColors": "Standardfarben",
   "PE.Views.TableSettings.textTemplate": "Vorlage auswählen",
-  "PE.Views.TableSettings.textThemeColors": "Designfarben",
   "PE.Views.TableSettings.textTotal": "Insgesamt",
   "PE.Views.TableSettings.tipAll": "Äußere Rahmenlinie und alle inneren Linien festlegen",
   "PE.Views.TableSettings.tipBottom": "Nur äußere untere Rahmenlinie festlegen",
@@ -705,6 +714,7 @@
   "PE.Views.TextArtSettings.strSize": "Größe",
   "PE.Views.TextArtSettings.strStroke": "Strich",
   "PE.Views.TextArtSettings.strTransparency": "Undurchsichtigkeit",
+  "PE.Views.TextArtSettings.strType": "Type",
   "PE.Views.TextArtSettings.textBorderSizeErr": "Der eingegebene Wert ist falsch.<br>Bitte geben Sie einen Wert zwischen 0 pt und 1584 pt ein.",
   "PE.Views.TextArtSettings.textColor": "Farbfüllung",
   "PE.Views.TextArtSettings.textDirection": "Direction",
@@ -715,17 +725,15 @@
   "PE.Views.TextArtSettings.textGradientFill": "Füllung mit Farbverlauf",
   "PE.Views.TextArtSettings.textImageTexture": "Bild oder Textur",
   "PE.Views.TextArtSettings.textLinear": "Linear",
-  "PE.Views.TextArtSettings.textNewColor": "Neue benutzerdefinierte Farbpalette hinzufügen",
+  "PE.Views.TextArtSettings.textNewColor": "Benutzerdefinierte Farbe",
   "PE.Views.TextArtSettings.textNoFill": "Keine Füllung",
   "PE.Views.TextArtSettings.textPatternFill": "Muster",
   "PE.Views.TextArtSettings.textRadial": "Radial",
   "PE.Views.TextArtSettings.textSelectTexture": "Wählen",
-  "PE.Views.TextArtSettings.textStandartColors": "Standardfarben",
   "PE.Views.TextArtSettings.textStretch": "Ausdehnung",
   "PE.Views.TextArtSettings.textStyle": "Stil",
   "PE.Views.TextArtSettings.textTemplate": "Vorlage",
   "PE.Views.TextArtSettings.textTexture": "Aus Textur",
-  "PE.Views.TextArtSettings.textThemeColors": "Designfarben",
   "PE.Views.TextArtSettings.textTile": "Kachel",
   "PE.Views.TextArtSettings.textTransform": "Transformieren\t",
   "PE.Views.TextArtSettings.txtBrownPaper": "Kraftpapier",
@@ -782,12 +790,13 @@
   "PE.Views.Toolbar.textShapeAlignMiddle": "Mittig ausrichten",
   "PE.Views.Toolbar.textShapeAlignRight": "Rechts ausrichten",
   "PE.Views.Toolbar.textShapeAlignTop": "Oben ausrichten",
-  "PE.Views.Toolbar.textStandartColors": "Standardfarben",
+  "PE.Views.Toolbar.textShowBegin": "Show from Beginning",
+  "PE.Views.Toolbar.textShowCurrent": "Show from Current slide",
+  "PE.Views.Toolbar.textShowSettings": "Show Settings",
   "PE.Views.Toolbar.textStock": "Kurs",
   "PE.Views.Toolbar.textStrikeout": "Durchgestrichen",
   "PE.Views.Toolbar.textSubscript": "Tiefgestellt",
   "PE.Views.Toolbar.textSuperscript": "Hochgestellt",
-  "PE.Views.Toolbar.textThemeColors": "Designfarben",
   "PE.Views.Toolbar.textTitleError": "Fehler",
   "PE.Views.Toolbar.textUnderline": "Unterstrichen",
   "PE.Views.Toolbar.textZoom": "Zoom",

apps/presentationeditor/main/locale/en.json

@@ -80,6 +80,7 @@
   "Common.Views.ExternalDiagramEditor.textTitle": "Chart Editor",
   "Common.Views.Header.openNewTabText": "Open in New Tab",
   "Common.Views.Header.textBack": "Go to Documents",
+  "Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
   "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel",
   "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
   "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
@@ -93,10 +94,10 @@
   "Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Number of Rows",
   "Common.Views.InsertTableDialog.txtTitle": "Table Size",
+  "Common.Views.PluginDlg.textLoading": "Loading",
   "Common.Views.Plugins.strPlugins": "Plugins",
   "Common.Views.Plugins.textLoading": "Loading",
   "Common.Views.Plugins.textStart": "Start",
-  "Common.Views.PluginDlg.textLoading": "Loading",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Requesting editing rights...",
   "PE.Controllers.LeftMenu.textNoTextFound": "The data you have been searching for could not be found. Please adjust your search options.",
@@ -138,6 +139,7 @@
   "PE.Controllers.Main.loadThemeTextText": "Loading theme...",
   "PE.Controllers.Main.loadThemeTitleText": "Loading Theme",
   "PE.Controllers.Main.notcriticalErrorTitle": "Warning",
+  "PE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
   "PE.Controllers.Main.openTextText": "Opening presentation...",
   "PE.Controllers.Main.openTitleText": "Opening Presentation",
   "PE.Controllers.Main.printTextText": "Printing presentation...",
@@ -145,6 +147,7 @@
   "PE.Controllers.Main.reloadButtonText": "Reload Page",
   "PE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this presentation right now. Please try again later.",
   "PE.Controllers.Main.requestEditFailedTitleText": "Access denied",
+  "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
   "PE.Controllers.Main.savePreparingText": "Preparing to save",
   "PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
   "PE.Controllers.Main.saveTextText": "Saving presentation...",
@@ -161,6 +164,7 @@
   "PE.Controllers.Main.textShape": "Shape",
   "PE.Controllers.Main.textStrict": "Strict mode",
   "PE.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.",
+  "PE.Controllers.Main.titleLicenseExp": "License expired",
   "PE.Controllers.Main.txtArt": "Your text here",
   "PE.Controllers.Main.txtBasicShapes": "Basic Shapes",
   "PE.Controllers.Main.txtButtons": "Buttons",
@@ -222,10 +226,9 @@
   "PE.Controllers.Main.uploadImageTitleText": "Uploading Image",
   "PE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher",
   "PE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.",
+  "PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
-  "PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
-  "PE.Controllers.Main.titleLicenseExp": "License expired",
   "PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
   "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.<br>The text style will be displayed using one of the system fonts, the saved font will be used when it is available.<br>Do you want to continue?",
   "PE.Controllers.Toolbar.textEmptyImgUrl": "You need to specify image URL.",
@@ -240,7 +243,7 @@
   "PE.Views.ChartSettings.textKeepRatio": "Constant Proportions",
   "PE.Views.ChartSettings.textLine": "Line Chart",
   "PE.Views.ChartSettings.textPie": "Pie Chart",
-  "PE.Views.ChartSettings.textPoint": "Point Chart",
+  "PE.Views.ChartSettings.textPoint": "XY (Scatter) Chart",
   "PE.Views.ChartSettings.textSize": "Size",
   "PE.Views.ChartSettings.textStock": "Stock Chart",
   "PE.Views.ChartSettings.textStyle": "Style",
@@ -380,6 +383,7 @@
   "PE.Views.FileMenuPanels.Settings.txtAll": "View All",
   "PE.Views.FileMenuPanels.Settings.txtCm": "Centimeter",
   "PE.Views.FileMenuPanels.Settings.txtFitSlide": "Fit Slide",
+  "PE.Views.FileMenuPanels.Settings.txtFitWidth": "Fit to Width",
   "PE.Views.FileMenuPanels.Settings.txtInch": "Inch",
   "PE.Views.FileMenuPanels.Settings.txtInput": "Alternate Input",
   "PE.Views.FileMenuPanels.Settings.txtLast": "View Last",
@@ -648,7 +652,7 @@
   "PE.Views.Statusbar.pageIndexText": "Slide {0} of {1}",
   "PE.Views.Statusbar.tipAccessRights": "Manage document access rights",
   "PE.Views.Statusbar.tipFitPage": "Fit Slide",
-  "PE.Views.Statusbar.tipFitWidth": "Fit Width",
+  "PE.Views.Statusbar.tipFitWidth": "Fit to Width",
   "PE.Views.Statusbar.tipMoreUsers": "and %1 users.",
   "PE.Views.Statusbar.tipPreview": "Start Slideshow",
   "PE.Views.Statusbar.tipShowUsers": "To see all users click the icon below.",
@@ -777,7 +781,7 @@
   "PE.Views.Toolbar.textColumn": "Column Chart",
   "PE.Views.Toolbar.textCompactView": "View Compact Toolbar",
   "PE.Views.Toolbar.textFitPage": "Fit Slide",
-  "PE.Views.Toolbar.textFitWidth": "Fit Width",
+  "PE.Views.Toolbar.textFitWidth": "Fit to Width",
   "PE.Views.Toolbar.textHideLines": "Hide Rulers",
   "PE.Views.Toolbar.textHideStatusBar": "Hide Status Bar",
   "PE.Views.Toolbar.textHideTitleBar": "Hide Title Bar",
@@ -788,7 +792,7 @@
   "PE.Views.Toolbar.textNewColor": "Custom Color",
   "PE.Views.Toolbar.textOK": "OK",
   "PE.Views.Toolbar.textPie": "Pie Chart",
-  "PE.Views.Toolbar.textPoint": "Point Chart",
+  "PE.Views.Toolbar.textPoint": "XY (Scatter) Chart",
   "PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom",
   "PE.Views.Toolbar.textShapeAlignCenter": "Align Center",
   "PE.Views.Toolbar.textShapeAlignLeft": "Align Left",

apps/presentationeditor/main/locale/es.json

@@ -28,6 +28,8 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Reemplazar todo",
   "Common.UI.SynchronizeTip.textDontShow": "No volver a mostrar este mensaje",
   "Common.UI.SynchronizeTip.textSynchronize": "El documento ha sido cambiado por otro usuario.<br/>Por favor haga clic para guardar sus cambios y recargue las actualizaciones.",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Colores estándar",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Colores de tema",
   "Common.UI.Window.cancelButtonText": "Cancelar",
   "Common.UI.Window.closeButtonText": "Cerrar",
   "Common.UI.Window.noButtonText": "No",
@@ -91,12 +93,16 @@
   "Common.Views.InsertTableDialog.txtMinText": "El valor mínimo para este campo es {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Número de filas",
   "Common.Views.InsertTableDialog.txtTitle": "Tamaño de tabla",
+  "Common.Views.PluginDlg.textLoading": "Loading",
+  "Common.Views.Plugins.strPlugins": "Plugins",
+  "Common.Views.Plugins.textLoading": "Loading",
+  "Common.Views.Plugins.textStart": "Start",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Presentación sin nombre",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Solicitando derechos de edición...",
   "PE.Controllers.LeftMenu.textNoTextFound": "No se puede encontrar los datos que usted busca. Por favor, ajuste los parámetros de búsqueda.",
   "PE.Controllers.Main.applyChangesTextText": "Cargando datos...",
   "PE.Controllers.Main.applyChangesTitleText": "Cargando datos",
-  "PE.Controllers.Main.convertationErrorText": "Conversión fallida.",
+  "PE.Controllers.Main.convertationErrorText": "Fallo de conversión.",
   "PE.Controllers.Main.convertationTimeoutText": "Tiempo de conversión está superado.",
   "PE.Controllers.Main.criticalErrorExtText": "Pulse \"OK\" para regresar a la lista de documentos.",
   "PE.Controllers.Main.criticalErrorTitle": "Error",
@@ -117,6 +123,7 @@
   "PE.Controllers.Main.errorUpdateVersion": "Se ha cambiado la versión del archivo. La página será actualizada.",
   "PE.Controllers.Main.errorUserDrop": "No se puede acceder al archivo ahora.",
   "PE.Controllers.Main.errorUsersExceed": "El número de usuarios permitido según su plan de precios fue excedido",
+  "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.",
   "PE.Controllers.Main.leavePageText": "Hay cambios no guardados en esta presentación. Pulse \"Permanecer en esta página\", después \"Guardar\" para guardadarlos. Pulse \"Abandonar esta página\" para descartar todos los cambios no guardados.",
   "PE.Controllers.Main.loadFontsTextText": "Cargando datos...",
   "PE.Controllers.Main.loadFontsTitleText": "Cargando datos",
@@ -131,6 +138,7 @@
   "PE.Controllers.Main.loadThemeTextText": "Cargando tema...",
   "PE.Controllers.Main.loadThemeTitleText": "Cargando tema",
   "PE.Controllers.Main.notcriticalErrorTitle": "Aviso",
+  "PE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
   "PE.Controllers.Main.openTextText": "Abriendo presentación...",
   "PE.Controllers.Main.openTitleText": "Abriendo presentación",
   "PE.Controllers.Main.printTextText": "Imprimiendo presentación...",
@@ -138,6 +146,7 @@
   "PE.Controllers.Main.reloadButtonText": "Decargar página",
   "PE.Controllers.Main.requestEditFailedMessageText": "Alguien está editando esta presentación ahora. Por favor inténtelo de nuevo más tarde.",
   "PE.Controllers.Main.requestEditFailedTitleText": "Acceso negado",
+  "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
   "PE.Controllers.Main.savePreparingText": "Preparando para guardar",
   "PE.Controllers.Main.savePreparingTitle": "Preparando para guardar. Espere por favor...",
   "PE.Controllers.Main.saveTextText": "Guardando presentación...",
@@ -154,6 +163,7 @@
   "PE.Controllers.Main.textShape": "Forma",
   "PE.Controllers.Main.textStrict": "Modo estricto",
   "PE.Controllers.Main.textTryUndoRedo": "Las funciones Anular/Rehacer se desactivan para el modo co-edición rápido.<br>Haga Clic en el botón \"modo estricto\" para cambiar al modo de co-edición estricta para editar el archivo sin la interferencia de otros usuarios y enviar sus cambios sólo después de guardarlos. Se puede cambiar entre los modos de co-edición usando los ajustes avanzados de edición.",
+  "PE.Controllers.Main.titleLicenseExp": "License expired",
   "PE.Controllers.Main.txtArt": "Su texto aquí",
   "PE.Controllers.Main.txtBasicShapes": "Formas básicas",
   "PE.Controllers.Main.txtButtons": "Botones",
@@ -215,6 +225,7 @@
   "PE.Controllers.Main.uploadImageTitleText": "Subiendo imagen",
   "PE.Controllers.Main.warnBrowserIE9": "Este aplicación tiene baja capacidad en IE9. Utilice IE10 o superior",
   "PE.Controllers.Main.warnBrowserZoom": "La configuración actual de zoom de su navegador no está soportada por completo. Por favor restablezca zoom predeterminado pulsando Ctrl+0.",
+  "PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "PE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado.",
   "PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
@@ -371,6 +382,7 @@
   "PE.Views.FileMenuPanels.Settings.txtAll": "Ver todo",
   "PE.Views.FileMenuPanels.Settings.txtCm": "Centímetro",
   "PE.Views.FileMenuPanels.Settings.txtFitSlide": "Ajustar diapositiva",
+  "PE.Views.FileMenuPanels.Settings.txtFitWidth": "Fit to Width",
   "PE.Views.FileMenuPanels.Settings.txtInch": "Pulgada",
   "PE.Views.FileMenuPanels.Settings.txtInput": "Entrada alternativa",
   "PE.Views.FileMenuPanels.Settings.txtLast": "Ver últimos",
@@ -397,6 +409,8 @@
   "PE.Views.HyperlinkSettingsDialog.txtPrev": "Diapositiva anterior",
   "PE.Views.HyperlinkSettingsDialog.txtSlide": "Diapositiva",
   "PE.Views.ImageSettings.textAdvanced": "Mostrar ajustes avanzados",
+  "PE.Views.ImageSettings.textEdit": "Edit",
+  "PE.Views.ImageSettings.textEditObject": "Edit Object",
   "PE.Views.ImageSettings.textFromFile": "De archivo",
   "PE.Views.ImageSettings.textFromUrl": "De URL",
   "PE.Views.ImageSettings.textHeight": "Altura",
@@ -417,6 +431,7 @@
   "PE.Views.LeftMenu.tipChat": "Chateo",
   "PE.Views.LeftMenu.tipComments": "Comentarios",
   "PE.Views.LeftMenu.tipFile": "Archivo",
+  "PE.Views.LeftMenu.tipPlugins": "Plugins",
   "PE.Views.LeftMenu.tipSearch": "Buscar",
   "PE.Views.LeftMenu.tipSlides": "Diapositivas",
   "PE.Views.LeftMenu.tipSupport": "Feedback y Soporte",
@@ -474,6 +489,7 @@
   "PE.Views.ShapeSettings.strSize": "Tamaño",
   "PE.Views.ShapeSettings.strStroke": "Trazo",
   "PE.Views.ShapeSettings.strTransparency": "Opacidad ",
+  "PE.Views.ShapeSettings.strType": "Type",
   "PE.Views.ShapeSettings.textAdvanced": "Mostrar ajustes avanzados",
   "PE.Views.ShapeSettings.textBorderSizeErr": "El valor numérico es incorrecto.<br>Por favor, introduzca un valor de 0 a 1584 puntos.",
   "PE.Views.ShapeSettings.textColor": "Color de relleno",
@@ -490,11 +506,9 @@
   "PE.Views.ShapeSettings.textPatternFill": "Patrón",
   "PE.Views.ShapeSettings.textRadial": "Radial",
   "PE.Views.ShapeSettings.textSelectTexture": "Seleccionar",
-  "PE.Views.ShapeSettings.textStandartColors": "Colores estándar",
   "PE.Views.ShapeSettings.textStretch": "Estirar",
   "PE.Views.ShapeSettings.textStyle": "Estilo",
   "PE.Views.ShapeSettings.textTexture": "De textura",
-  "PE.Views.ShapeSettings.textThemeColors": "Colores de tema",
   "PE.Views.ShapeSettings.textTile": "Mosaico",
   "PE.Views.ShapeSettings.txtBrownPaper": "Papel marrón",
   "PE.Views.ShapeSettings.txtCanvas": "Lienzo",
@@ -580,11 +594,9 @@
   "PE.Views.SlideSettings.textSelectTexture": "Seleccionar",
   "PE.Views.SlideSettings.textSmoothly": "Suavemente",
   "PE.Views.SlideSettings.textSplit": "Dividir",
-  "PE.Views.SlideSettings.textStandartColors": "Colores estándar",
   "PE.Views.SlideSettings.textStretch": "Estirar",
   "PE.Views.SlideSettings.textStyle": "Estilo",
   "PE.Views.SlideSettings.textTexture": "De textura",
-  "PE.Views.SlideSettings.textThemeColors": "Colores de tema",
   "PE.Views.SlideSettings.textTile": "Mosaico",
   "PE.Views.SlideSettings.textTop": "Superior",
   "PE.Views.SlideSettings.textTopLeft": "Superior izquierdo",
@@ -609,9 +621,16 @@
   "PE.Views.SlideSettings.txtLeather": "Piel",
   "PE.Views.SlideSettings.txtPapyrus": "Papiro",
   "PE.Views.SlideSettings.txtWood": "Madera",
+  "PE.Views.SlideshowSettings.cancelButtonText": "Cancel",
+  "PE.Views.SlideshowSettings.okButtonText": "Ok",
+  "PE.Views.SlideshowSettings.textLoop": "Loop continuously until 'Esc' is pressed",
+  "PE.Views.SlideshowSettings.textTitle": "Show Settings",
   "PE.Views.SlideSizeSettings.cancelButtonText": "Cancelar",
   "PE.Views.SlideSizeSettings.okButtonText": "Aceptar",
+  "PE.Views.SlideSizeSettings.strLandscape": "Landscape",
+  "PE.Views.SlideSizeSettings.strPortrait": "Portrait",
   "PE.Views.SlideSizeSettings.textHeight": "Altura",
+  "PE.Views.SlideSizeSettings.textSlideOrientation": "Slide Orientation",
   "PE.Views.SlideSizeSettings.textSlideSize": "Tamaño de diapositiva",
   "PE.Views.SlideSizeSettings.textTitle": "Ajustes de tamaño de diapositiva",
   "PE.Views.SlideSizeSettings.textWidth": "Ancho",
@@ -671,9 +690,7 @@
   "PE.Views.TableSettings.textNewColor": "Color personalizado",
   "PE.Views.TableSettings.textRows": "Filas",
   "PE.Views.TableSettings.textSelectBorders": "Seleccione bordes que usted desea cambiar aplicando estilo seleccionado",
-  "PE.Views.TableSettings.textStandartColors": "Colores estándar",
   "PE.Views.TableSettings.textTemplate": "Seleccionar de plantilla",
-  "PE.Views.TableSettings.textThemeColors": "Colores de tema",
   "PE.Views.TableSettings.textTotal": "Total",
   "PE.Views.TableSettings.tipAll": "Fijar borde exterior y todas líneas interiores ",
   "PE.Views.TableSettings.tipBottom": "Fijar sólo borde exterior inferior",
@@ -705,6 +722,7 @@
   "PE.Views.TextArtSettings.strSize": "Tamaño",
   "PE.Views.TextArtSettings.strStroke": "Trazo",
   "PE.Views.TextArtSettings.strTransparency": "Opacidad ",
+  "PE.Views.TextArtSettings.strType": "Type",
   "PE.Views.TextArtSettings.textBorderSizeErr": "El valor numérico es incorrecto.<br>Por favor, introduzca un valor de 0 a 1584 puntos.",
   "PE.Views.TextArtSettings.textColor": "Color de relleno",
   "PE.Views.TextArtSettings.textDirection": "Dirección ",
@@ -720,12 +738,10 @@
   "PE.Views.TextArtSettings.textPatternFill": "Patrón",
   "PE.Views.TextArtSettings.textRadial": "Radial",
   "PE.Views.TextArtSettings.textSelectTexture": "Seleccionar",
-  "PE.Views.TextArtSettings.textStandartColors": "Colores estándar",
   "PE.Views.TextArtSettings.textStretch": "Estirar",
   "PE.Views.TextArtSettings.textStyle": "Estilo",
   "PE.Views.TextArtSettings.textTemplate": "Plantilla",
   "PE.Views.TextArtSettings.textTexture": "De textura",
-  "PE.Views.TextArtSettings.textThemeColors": "Colores de tema",
   "PE.Views.TextArtSettings.textTile": "Mosaico",
   "PE.Views.TextArtSettings.textTransform": "Transformar",
   "PE.Views.TextArtSettings.txtBrownPaper": "Papel marrón",
@@ -782,12 +798,13 @@
   "PE.Views.Toolbar.textShapeAlignMiddle": "Alinear al medio",
   "PE.Views.Toolbar.textShapeAlignRight": "Alinear a la derecha",
   "PE.Views.Toolbar.textShapeAlignTop": "Alinear en la parte superior",
-  "PE.Views.Toolbar.textStandartColors": "Colores estándar",
+  "PE.Views.Toolbar.textShowBegin": "Show from Beginning",
+  "PE.Views.Toolbar.textShowCurrent": "Show from Current slide",
+  "PE.Views.Toolbar.textShowSettings": "Show Settings",
   "PE.Views.Toolbar.textStock": "De cotizaciones",
   "PE.Views.Toolbar.textStrikeout": "Tachado",
   "PE.Views.Toolbar.textSubscript": "Subíndice",
   "PE.Views.Toolbar.textSuperscript": "Sobreíndice",
-  "PE.Views.Toolbar.textThemeColors": "Colores de tema",
   "PE.Views.Toolbar.textTitleError": "Error",
   "PE.Views.Toolbar.textUnderline": "Subrayar",
   "PE.Views.Toolbar.textZoom": "Zoom",

apps/presentationeditor/main/locale/fr.json

@@ -28,6 +28,8 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Remplacer tout",
   "Common.UI.SynchronizeTip.textDontShow": "N'afficher plus ce message",
   "Common.UI.SynchronizeTip.textSynchronize": "Le document a été modifié par un autre utilisateur.<br/>Cliquez pour enregistrer vos modifications et recharger les mises à jour.",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème",
   "Common.UI.Window.cancelButtonText": "Annuler",
   "Common.UI.Window.closeButtonText": "Fermer",
   "Common.UI.Window.noButtonText": "Non",
@@ -91,6 +93,10 @@
   "Common.Views.InsertTableDialog.txtMinText": "La valeur minimale pour ce champ est {0}.",
   "Common.Views.InsertTableDialog.txtRows": "Nombre de lignes",
   "Common.Views.InsertTableDialog.txtTitle": "Taille du tableau",
+  "Common.Views.PluginDlg.textLoading": "Loading",
+  "Common.Views.Plugins.strPlugins": "Plugins",
+  "Common.Views.Plugins.textLoading": "Chargement",
+  "Common.Views.Plugins.textStart": "Lancer",
   "PE.Controllers.LeftMenu.newDocumentTitle": "Présentation sans nom",
   "PE.Controllers.LeftMenu.requestEditRightsText": "Demande des droits de modification...",
   "PE.Controllers.LeftMenu.textNoTextFound": "Votre recherche n'a donné aucun résultat.S'il vous plaît, modifiez vos critères de recherche.",
@@ -117,6 +123,7 @@
   "PE.Controllers.Main.errorUpdateVersion": "La version du fichier a été changée. La page sera rechargée.",
   "PE.Controllers.Main.errorUserDrop": "Impossible d'accéder au fichier",
   "PE.Controllers.Main.errorUsersExceed": "Le nombre d'utilisateurs autorisés par le plan tarifaire a été dépassé",
+  "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.",
   "PE.Controllers.Main.leavePageText": "Vous avez des modifications non enregistrées dans cette présentation. Cliquez sur \"Rester sur cette page\", ensuite sur \"Enregistrer\" pour enregistrer les modifications. Cliquez sur \"Quitter cette page\" pour annuler toutes les modifications non enregistrées.",
   "PE.Controllers.Main.loadFontsTextText": "Chargement des données...",
   "PE.Controllers.Main.loadFontsTitleText": "Chargement des données",
@@ -131,6 +138,7 @@
   "PE.Controllers.Main.loadThemeTextText": "Chargement du thème en cours...",
   "PE.Controllers.Main.loadThemeTitleText": "Chargement du thème",
   "PE.Controllers.Main.notcriticalErrorTitle": "Avertissement",
+  "PE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
   "PE.Controllers.Main.openTextText": "Ouverture de la présentation...",
   "PE.Controllers.Main.openTitleText": "Ouverture de la présentation",
   "PE.Controllers.Main.printTextText": "Impression de la présentation...",
@@ -138,6 +146,7 @@
   "PE.Controllers.Main.reloadButtonText": "Recharger la page",
   "PE.Controllers.Main.requestEditFailedMessageText": "Quelqu'un est en train de modifier cette présentation. Veuillez réessayer plus tard.",
   "PE.Controllers.Main.requestEditFailedTitleText": "Accès refusé",
+  "PE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
   "PE.Controllers.Main.savePreparingText": "Préparation à l'enregistrement ",
   "PE.Controllers.Main.savePreparingTitle": "Préparation à l'enregistrement en cours. Veuillez patienter...",
   "PE.Controllers.Main.saveTextText": "Enregistrement de la présentation...",
@@ -146,14 +155,15 @@
   "PE.Controllers.Main.splitMaxColsErrorText": "Le nombre de colonnes doivent être inférieure à %1.",
   "PE.Controllers.Main.splitMaxRowsErrorText": "Le nombre de lignes doit être inférieure à %1.",
   "PE.Controllers.Main.textAnonymous": "Anonyme",
-  "PE.Controllers.Main.textBuyNow": "Visit website",
+  "PE.Controllers.Main.textBuyNow": "Visiter le site web",
   "PE.Controllers.Main.textCloseTip": "Cliquez pour fermer la conseil",
-  "PE.Controllers.Main.textContactUs": "Contact sales",
+  "PE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes",
   "PE.Controllers.Main.textLoadingDocument": "Chargement de présentation",
-  "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version",
+  "PE.Controllers.Main.textNoLicenseTitle": "La version open source de ONLYOFFICE",
   "PE.Controllers.Main.textShape": "Forme",
   "PE.Controllers.Main.textStrict": "Mode strict",
   "PE.Controllers.Main.textTryUndoRedo": "Les fonctions annuler/rétablir sont désactivées pour le mode de co-édition rapide.<br>Cliquez sur le bouton \"Mode strict\" pour passer au mode de la co-édition stricte pour modifier le fichier sans interférence d'autres utilisateurs et envoyer vos modifications seulement après que vous les enregistrez. Vous pouvez basculer entre les modes de co-édition à l'aide de paramètres avancés d'éditeur.",
+  "PE.Controllers.Main.titleLicenseExp": "License expired",
   "PE.Controllers.Main.txtArt": "Your text here",
   "PE.Controllers.Main.txtBasicShapes": "Formes de base",
   "PE.Controllers.Main.txtButtons": "Boutons",
@@ -215,6 +225,7 @@
   "PE.Controllers.Main.uploadImageTitleText": "Chargement d'une image",
   "PE.Controllers.Main.warnBrowserIE9": "L'application est peu compatible avec IE9. Utilisez IE10 ou version plus récente",
   "PE.Controllers.Main.warnBrowserZoom": "Le paramètre actuel de zoom de votre navigateur n'est pas accepté. Veuillez rétablir le niveau de zoom par défaut en appuyant sur Ctrl+0.",
+  "PE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "PE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "PE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.",
   "PE.Controllers.Statusbar.zoomText": "Zoom {0}%",
@@ -371,6 +382,7 @@
   "PE.Views.FileMenuPanels.Settings.txtAll": "Tout",
   "PE.Views.FileMenuPanels.Settings.txtCm": "Centimètre",
   "PE.Views.FileMenuPanels.Settings.txtFitSlide": "Ajuster la diapositive",
+  "PE.Views.FileMenuPanels.Settings.txtFitWidth": "Fit to Width",
   "PE.Views.FileMenuPanels.Settings.txtInch": "Pouce",
   "PE.Views.FileMenuPanels.Settings.txtInput": "Entrée alternative",
   "PE.Views.FileMenuPanels.Settings.txtLast": "Derniers",
@@ -397,6 +409,8 @@
   "PE.Views.HyperlinkSettingsDialog.txtPrev": "Diapositive précédente",
   "PE.Views.HyperlinkSettingsDialog.txtSlide": "Diapositive",
   "PE.Views.ImageSettings.textAdvanced": "Afficher les paramètres avancés",
+  "PE.Views.ImageSettings.textEdit": "Modifier",
+  "PE.Views.ImageSettings.textEditObject": "Modifier l'objet",
   "PE.Views.ImageSettings.textFromFile": "D'un fichier",
   "PE.Views.ImageSettings.textFromUrl": "D'une URL",
   "PE.Views.ImageSettings.textHeight": "Hauteur",
@@ -417,6 +431,7 @@
   "PE.Views.LeftMenu.tipChat": "Chat",
   "PE.Views.LeftMenu.tipComments": "Commentaires",
   "PE.Views.LeftMenu.tipFile": "Fichier",
+  "PE.Views.LeftMenu.tipPlugins": "Plugins",
   "PE.Views.LeftMenu.tipSearch": "Recherche",
   "PE.Views.LeftMenu.tipSlides": "Diapositives",
   "PE.Views.LeftMenu.tipSupport": "Commentaires & assistance",
@@ -474,6 +489,7 @@
   "PE.Views.ShapeSettings.strSize": "Taille",
   "PE.Views.ShapeSettings.strStroke": "Trait",
   "PE.Views.ShapeSettings.strTransparency": "Opacité",
+  "PE.Views.ShapeSettings.strType": "Type",
   "PE.Views.ShapeSettings.textAdvanced": "Afficher les paramètres avancés",
   "PE.Views.ShapeSettings.textBorderSizeErr": "La valeur saisie est incorrecte. <br>Entrez une valeur de 0 à 1584 points.",
   "PE.Views.ShapeSettings.textColor": "Couleur de remplissage",
@@ -490,11 +506,9 @@
   "PE.Views.ShapeSettings.textPatternFill": "Modèle",
   "PE.Views.ShapeSettings.textRadial": "Radial",
   "PE.Views.ShapeSettings.textSelectTexture": "Sélectionner",
-  "PE.Views.ShapeSettings.textStandartColors": "Couleurs standard",
   "PE.Views.ShapeSettings.textStretch": "Étirement",
   "PE.Views.ShapeSettings.textStyle": "Style",
   "PE.Views.ShapeSettings.textTexture": "D'une texture",
-  "PE.Views.ShapeSettings.textThemeColors": "Couleurs de thème",
   "PE.Views.ShapeSettings.textTile": "Mosaïque",
   "PE.Views.ShapeSettings.txtBrownPaper": "Papier brun",
   "PE.Views.ShapeSettings.txtCanvas": "Toile",
@@ -580,11 +594,9 @@
   "PE.Views.SlideSettings.textSelectTexture": "Sélectionner",
   "PE.Views.SlideSettings.textSmoothly": "Transition douce",
   "PE.Views.SlideSettings.textSplit": "Diviser",
-  "PE.Views.SlideSettings.textStandartColors": "Couleurs standard",
   "PE.Views.SlideSettings.textStretch": "Étirement",
   "PE.Views.SlideSettings.textStyle": "Style",
   "PE.Views.SlideSettings.textTexture": "D'une texture",
-  "PE.Views.SlideSettings.textThemeColors": "Couleurs de thème",
   "PE.Views.SlideSettings.textTile": "Mosaïque",
   "PE.Views.SlideSettings.textTop": "En haut",
   "PE.Views.SlideSettings.textTopLeft": "En haut à gauche",
@@ -609,9 +621,16 @@
   "PE.Views.SlideSettings.txtLeather": "Cuir",
   "PE.Views.SlideSettings.txtPapyrus": "Papyrus",
   "PE.Views.SlideSettings.txtWood": "Bois",
+  "PE.Views.SlideshowSettings.cancelButtonText": "Annuler",
+  "PE.Views.SlideshowSettings.okButtonText": "OK",
+  "PE.Views.SlideshowSettings.textLoop": "Boucle continue jusqu'à ce que le bouton «Esc» soit pressé",
+  "PE.Views.SlideshowSettings.textTitle": "Afficher les paramètres",
   "PE.Views.SlideSizeSettings.cancelButtonText": "Annuler",
   "PE.Views.SlideSizeSettings.okButtonText": "Ok",
+  "PE.Views.SlideSizeSettings.strLandscape": "Paysage",
+  "PE.Views.SlideSizeSettings.strPortrait": "Portrait",
   "PE.Views.SlideSizeSettings.textHeight": "Hauteur",
+  "PE.Views.SlideSizeSettings.textSlideOrientation": "Orientation des diapositives",
   "PE.Views.SlideSizeSettings.textSlideSize": "Taille de la diapositive",
   "PE.Views.SlideSizeSettings.textTitle": "Paramètres de taille",
   "PE.Views.SlideSizeSettings.textWidth": "Largeur",
@@ -671,9 +690,7 @@
   "PE.Views.TableSettings.textNewColor": "Couleur personnalisée",
   "PE.Views.TableSettings.textRows": "Lignes",
   "PE.Views.TableSettings.textSelectBorders": "Sélectionnez les bordures à modifier en appliquant le style choisi ci-dessus",
-  "PE.Views.TableSettings.textStandartColors": "Couleurs standard",
   "PE.Views.TableSettings.textTemplate": "Sélectionner à partir d'un modèle",
-  "PE.Views.TableSettings.textThemeColors": "Couleurs de thème",
   "PE.Views.TableSettings.textTotal": "Total",
   "PE.Views.TableSettings.tipAll": "Bordure extérieure et la totalité des lignes intérieures",
   "PE.Views.TableSettings.tipBottom": "Seulement bordure extérieure inférieure",
@@ -705,6 +722,7 @@
   "PE.Views.TextArtSettings.strSize": "Size",
   "PE.Views.TextArtSettings.strStroke": "Stroke",
   "PE.Views.TextArtSettings.strTransparency": "Opacité",
+  "PE.Views.TextArtSettings.strType": "Type",
   "PE.Views.TextArtSettings.textBorderSizeErr": "The entered value is incorrect.<br>Please enter a value between 0 pt and 1584 pt.",
   "PE.Views.TextArtSettings.textColor": "Couleur de remplissage",
   "PE.Views.TextArtSettings.textDirection": "Direction",
@@ -715,17 +733,15 @@
   "PE.Views.TextArtSettings.textGradientFill": "Remplissage en dégradé",
   "PE.Views.TextArtSettings.textImageTexture": "Image ou texture",
   "PE.Views.TextArtSettings.textLinear": "Linéaire",
-  "PE.Views.TextArtSettings.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "PE.Views.TextArtSettings.textNewColor": "Couleur Personnalisée",
   "PE.Views.TextArtSettings.textNoFill": "Pas de remplissage",
   "PE.Views.TextArtSettings.textPatternFill": "Modèle",
   "PE.Views.TextArtSettings.textRadial": "Radial",
   "PE.Views.TextArtSettings.textSelectTexture": "Select",
-  "PE.Views.TextArtSettings.textStandartColors": "Standard Colors",
   "PE.Views.TextArtSettings.textStretch": "Stretch",
   "PE.Views.TextArtSettings.textStyle": "Style",
   "PE.Views.TextArtSettings.textTemplate": "Template",
   "PE.Views.TextArtSettings.textTexture": "From Texture",
-  "PE.Views.TextArtSettings.textThemeColors": "Theme Colors",
   "PE.Views.TextArtSettings.textTile": "Tile",
   "PE.Views.TextArtSettings.textTransform": "Transform",
   "PE.Views.TextArtSettings.txtBrownPaper": "Papier brun",
@@ -782,12 +798,13 @@
   "PE.Views.Toolbar.textShapeAlignMiddle": "Aligner au milieu",
   "PE.Views.Toolbar.textShapeAlignRight": "Aligner à droite",
   "PE.Views.Toolbar.textShapeAlignTop": "Aligner en haut",
-  "PE.Views.Toolbar.textStandartColors": "Couleurs standard",
+  "PE.Views.Toolbar.textShowBegin": "Afficher dès le début",
+  "PE.Views.Toolbar.textShowCurrent": "Afficher de la diapositive actuelle",
+  "PE.Views.Toolbar.textShowSettings": "Afficher les paramètres",
   "PE.Views.Toolbar.textStock": "Boursier",
   "PE.Views.Toolbar.textStrikeout": "Barré",
   "PE.Views.Toolbar.textSubscript": "Indice",
   "PE.Views.Toolbar.textSuperscript": "Exposant",
-  "PE.Views.Toolbar.textThemeColors": "Couleurs de thème",
   "PE.Views.Toolbar.textTitleError": "Erreur",
   "PE.Views.Toolbar.textUnderline": "Souligné",
   "PE.Views.Toolbar.textZoom": "Zoom",

apps/presentationeditor/mobile/app/controller/toolbar/View.js

@@ -79,6 +79,24 @@ Ext.define('PE.controller.toolbar.View', {
             overlayContainer.element.on('touchend', this.onTouchEndDocument, this);
         }
 
+        if (Ext.os.is.iOS) {
+            Ext.each(Ext.ComponentQuery.query('button'), function(button) {
+                button.element.dom.ontouchstart = Ext.emptyFn();
+                button.element.dom.ontouchmove = Ext.emptyFn();
+                button.element.dom.ontouchend = Ext.emptyFn();
+            }, this);
+
+            Ext.each(Ext.ComponentQuery.query('toolbar'), function(toolbar) {
+                var preventFn = function(e){
+                    e.preventDefault();
+                };
+
+                toolbar.element.dom.ontouchstart = preventFn;
+                toolbar.element.dom.ontouchmove = preventFn;
+                toolbar.element.dom.ontouchend = preventFn;
+            }, this);
+        }
+
         Common.Gateway.on('init', Ext.bind(this.loadConfig, this));
     },
 

apps/presentationeditor/mobile/resources/sass/_application-base.scss

@@ -13,23 +13,42 @@ $icons-default-size         : 24px;
 $icons-default-image-width  : 72px;
 $icons-default-image-height : 144px;
 
-@import 'sencha-touch/default/all';
+@import 'sencha-touch/default';
+
+@import 'sencha-touch/default/src/Class';
+@import 'sencha-touch/default/src/Button';
+//@import 'sencha-touch/default/src/Panel';
+@import 'sencha-touch/default/src/Sheet';
+@import 'sencha-touch/default/src/MessageBox';
+@import 'sencha-touch/default/src/Toolbar';
+//@import 'sencha-touch/default/src/Toast';
+//@import 'sencha-touch/default/src/Menu';
+//@import 'sencha-touch/default/src/carousel/Carousel';
+@import 'sencha-touch/default/src/form/Panel';
+//@import 'sencha-touch/default/src/form/FieldSet';
+//@import 'sencha-touch/default/src/field/Field';
+//@import 'sencha-touch/default/src/field/Checkbox';
+//@import 'sencha-touch/default/src/field/Radio';
+//@import 'sencha-touch/default/src/field/Search';
+//@import 'sencha-touch/default/src/field/Select';
+//@import 'sencha-touch/default/src/field/Slider';
+//@import 'sencha-touch/default/src/field/Spinner';
+//@import 'sencha-touch/default/src/field/TextArea';
+//@import 'sencha-touch/default/src/dataview/IndexBar';
+//@import 'sencha-touch/default/src/dataview/List';
+//@import 'sencha-touch/default/src/picker/Picker';
+//@import 'sencha-touch/default/src/plugin/ListPaging';
+//@import 'sencha-touch/default/src/plugin/PullRefresh';
+//@import 'sencha-touch/default/src/slider/Slider';
+//@import 'sencha-touch/default/src/slider/Toggle';
+//@import 'sencha-touch/default/src/tab/Panel';
+//@import 'sencha-touch/default/src/grid/Grid';
 
 @import 'common-buttons';
 @import 'common-toolbar';
 
 @import 'application-mixins';
 
-@include sencha-panel;
-@include sencha-buttons;
-@include sencha-toolbar;
-@include sencha-toolbar-forms;
-@include sencha-indexbar;
-@include sencha-layout;
-@include sencha-form;
-@include sencha-msgbox;
-@include sencha-loading-spinner;
-
 @include common-toolbar-ui('edit', $base-color);
 @include common-toolbar-ui('search', $base-color);
 

apps/presentationeditor/mobile/resources/sass/config-debug.rb

@@ -10,5 +10,6 @@ add_import_path File.join(dir, '..', '..', '..', '..', '..', 'apps', 'common', '
 # Compass configurations
 sass_path    = dir
 css_path     = File.join(dir, "..", "css")
-environment  = :development
+fonts_path   = File.join(dir, '..', '..', '..', '..', '..', 'apps', 'common', 'mobile', 'resources', 'fonts')
-output_style = :expanded
+environment  = :production
+output_style = :compressed

apps/presentationeditor/mobile/resources/sass/config.rb

@@ -10,5 +10,6 @@ add_import_path File.join(dir, '..', '..', '..', '..', '..', 'apps', 'common', '
 # Compass configurations
 sass_path    = dir
 css_path     = File.join(dir, "..", "css")
+fonts_path   = File.join(dir, '..', '..', '..', '..', '..', 'apps', 'common', 'mobile', 'resources', 'fonts')
 environment  = :production
 output_style = :compressed

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

@@ -759,9 +759,10 @@ define([
                     this.appOptions.canChat        = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);
 
                     this.appOptions.canBranding  = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object');
-                    if (this.appOptions.canBranding) {
+                    if (this.appOptions.canBranding)
                         this.headerView.setBranding(this.editorConfig.customization);
-                    }
+
+                    params.asc_getTrial() && this.headerView.setDeveloperMode(true);
                 }
 
                 this.appOptions.canRequestEditRights = this.editorConfig.canRequestEditRights;

apps/spreadsheeteditor/main/locale/de.json

@@ -25,6 +25,8 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Alle ersetzen",
   "Common.UI.SynchronizeTip.textDontShow": "Diese Meldung nicht mehr anzeigen",
   "Common.UI.SynchronizeTip.textSynchronize": "Das Dokument wurde von einem anderen Benutzer geändert.<br/>Bitte klicken hier, um Ihre Änderungen zu speichern und die Aktualisierungen neu zu laden.",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Standardfarben",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Designfarben",
   "Common.UI.Window.cancelButtonText": "Abbrechen",
   "Common.UI.Window.closeButtonText": "Schließen",
   "Common.UI.Window.noButtonText": "Nein",
@@ -84,7 +86,9 @@
   "Common.Views.OpenDialog.txtSpace": "Leerzeichen",
   "Common.Views.OpenDialog.txtTab": "Tabulator",
   "Common.Views.OpenDialog.txtTitle": "%1-Optionen wählen",
+  "SSE.Controllers.DocumentHolder.errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
   "SSE.Controllers.DocumentHolder.guestText": "Gast",
+  "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning",
   "SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Spaltenbreite {0} Symbole ({1} Pixel)",
   "SSE.Controllers.DocumentHolder.textChangeRowHeight": "Zeilenhöhe {0} Punkte ({1} Pixel)",
   "SSE.Controllers.DocumentHolder.textCtrlClick": "Drücken Sie die STRG-Taste und klicken Sie auf den Link",
@@ -221,6 +225,7 @@
   "SSE.Controllers.Main.uploadImageTitleText": "Bild wird hochgeladen",
   "SSE.Controllers.Main.warnBrowserIE9": "Die Anwendung hat geringe Fähigkeiten in IE9. Nutzen Sie IE10 oder höher.",
   "SSE.Controllers.Main.warnBrowserZoom": "Die aktuelle Zoom-Einstellung Ihres Webbrowsers wird nicht völlig unterstützt. Bitte stellen Sie die Standardeinstellung mithilfe der Tastenkombination STRG+0 wieder her.",
+  "SSE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "SSE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "SSE.Controllers.Main.warnProcessRightsChange": "Das Recht, die Datei zu bearbeiten, wurde Ihnen verweigert.",
   "SSE.Controllers.Print.strAllSheets": "Alle Blätter",
@@ -307,6 +312,7 @@
   "SSE.Views.ChartSettingsDlg.textBar": "Balken",
   "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Zwischen den Teilstrichen",
   "SSE.Views.ChartSettingsDlg.textBillions": "Milliarden",
+  "SSE.Views.ChartSettingsDlg.textBottom": "Bottom",
   "SSE.Views.ChartSettingsDlg.textCategoryName": "Kategoriename",
   "SSE.Views.ChartSettingsDlg.textCenter": "Zentriert",
   "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Diagrammelemente und <br/> Diagrammlegende",
@@ -320,6 +326,7 @@
   "SSE.Views.ChartSettingsDlg.textDataRows": "in Zeilen",
   "SSE.Views.ChartSettingsDlg.textDataSeries": "Datenreihe",
   "SSE.Views.ChartSettingsDlg.textDisplayLegend": "Legende anzeigen",
+  "SSE.Views.ChartSettingsDlg.textFit": "Fit to Width",
   "SSE.Views.ChartSettingsDlg.textFixed": "Fixiert",
   "SSE.Views.ChartSettingsDlg.textGridLines": "Gitternetzlinien ",
   "SSE.Views.ChartSettingsDlg.textHide": "Vergeben",
@@ -340,6 +347,7 @@
   "SSE.Views.ChartSettingsDlg.textLabelOptions": "Beschriftungsoptionen",
   "SSE.Views.ChartSettingsDlg.textLabelPos": "Beschriftungsposition\t",
   "SSE.Views.ChartSettingsDlg.textLayout": "Layout",
+  "SSE.Views.ChartSettingsDlg.textLeft": "Left",
   "SSE.Views.ChartSettingsDlg.textLeftOverlay": "Überlagerung links",
   "SSE.Views.ChartSettingsDlg.textLegendBottom": "Unten",
   "SSE.Views.ChartSettingsDlg.textLegendLeft": "Links",
@@ -370,6 +378,7 @@
   "SSE.Views.ChartSettingsDlg.textPie": "Kreis",
   "SSE.Views.ChartSettingsDlg.textPoint": "Punkt",
   "SSE.Views.ChartSettingsDlg.textReverse": "Werte in umgekehrter Reihenfolge",
+  "SSE.Views.ChartSettingsDlg.textRight": "Right",
   "SSE.Views.ChartSettingsDlg.textRightOverlay": "Überlagerung rechts",
   "SSE.Views.ChartSettingsDlg.textRotated": "Gedreht",
   "SSE.Views.ChartSettingsDlg.textSelectData": "Daten auswählen",
@@ -389,6 +398,7 @@
   "SSE.Views.ChartSettingsDlg.textThousands": "Tausende",
   "SSE.Views.ChartSettingsDlg.textTickOptions": "Parameter der Teilstriche",
   "SSE.Views.ChartSettingsDlg.textTitle": "Diagramm - Erweiterte Einstellungen",
+  "SSE.Views.ChartSettingsDlg.textTop": "Top",
   "SSE.Views.ChartSettingsDlg.textTrillions": "Billionen",
   "SSE.Views.ChartSettingsDlg.textType": "Typ",
   "SSE.Views.ChartSettingsDlg.textTypeData": "Typ und Daten",
@@ -454,6 +464,8 @@
   "SSE.Views.DocumentHolder.txtAddNamedRange": "Namen definieren\t",
   "SSE.Views.DocumentHolder.txtArrange": "Anordnen",
   "SSE.Views.DocumentHolder.txtAscending": "Aufsteigend",
+  "SSE.Views.DocumentHolder.txtAutoColumnWidth": "Auto Fit Column Width",
+  "SSE.Views.DocumentHolder.txtAutoRowHeight": "Auto Fit Row Height",
   "SSE.Views.DocumentHolder.txtClear": "Leeren",
   "SSE.Views.DocumentHolder.txtClearAll": "Alle",
   "SSE.Views.DocumentHolder.txtClearComments": "Kommentare",
@@ -463,6 +475,8 @@
   "SSE.Views.DocumentHolder.txtColumn": "Ganze Spalte",
   "SSE.Views.DocumentHolder.txtColumnWidth": "Spaltenbreite",
   "SSE.Views.DocumentHolder.txtCopy": "Kopieren",
+  "SSE.Views.DocumentHolder.txtCustomColumnWidth": "Custom Column Width",
+  "SSE.Views.DocumentHolder.txtCustomRowHeight": "Custom Row Height",
   "SSE.Views.DocumentHolder.txtCut": "Ausschneiden",
   "SSE.Views.DocumentHolder.txtDelete": "Löschen",
   "SSE.Views.DocumentHolder.txtDescending": "Absteigend",
@@ -613,6 +627,8 @@
   "SSE.Views.HyperlinkSettingsDialog.textTitle": "Hyperlink-Einstellungen",
   "SSE.Views.HyperlinkSettingsDialog.txtEmpty": "Dieses Feld ist erforderlich",
   "SSE.Views.HyperlinkSettingsDialog.txtNotUrl": "Dieses Feld muss eine URL im Format \"http://www.example.com\" enthalten",
+  "SSE.Views.ImageSettings.textEdit": "Edit",
+  "SSE.Views.ImageSettings.textEditObject": "Edit Object",
   "SSE.Views.ImageSettings.textFromFile": "Aus Datei",
   "SSE.Views.ImageSettings.textFromUrl": "Aus URL",
   "SSE.Views.ImageSettings.textHeight": "Höhe",
@@ -625,6 +641,7 @@
   "SSE.Views.LeftMenu.tipChat": "Chat",
   "SSE.Views.LeftMenu.tipComments": "Kommentare",
   "SSE.Views.LeftMenu.tipFile": "Datei",
+  "SSE.Views.LeftMenu.tipPlugins": "Plugins",
   "SSE.Views.LeftMenu.tipSearch": "Suchen",
   "SSE.Views.LeftMenu.tipSupport": "Feedback und Support",
   "SSE.Views.MainSettingsPrint.okButtonText": "Speichern",
@@ -773,6 +790,7 @@
   "SSE.Views.ShapeSettings.strSize": "Größe",
   "SSE.Views.ShapeSettings.strStroke": "Strich",
   "SSE.Views.ShapeSettings.strTransparency": "Undurchsichtigkeit",
+  "SSE.Views.ShapeSettings.strType": "Type",
   "SSE.Views.ShapeSettings.textAdvanced": "Erweiterte Einstellungen anzeigen",
   "SSE.Views.ShapeSettings.textBorderSizeErr": "Der eingegebene Wert ist falsch.<br>Bitte geben Sie einen Wert zwischen 0 pt und 1584 pt ein.",
   "SSE.Views.ShapeSettings.textColor": "Farbfüllung",
@@ -790,11 +808,9 @@
   "SSE.Views.ShapeSettings.textPatternFill": "Muster",
   "SSE.Views.ShapeSettings.textRadial": "Radial",
   "SSE.Views.ShapeSettings.textSelectTexture": "Wählen",
-  "SSE.Views.ShapeSettings.textStandartColors": "Standardfarben",
   "SSE.Views.ShapeSettings.textStretch": "Ausdehnung",
   "SSE.Views.ShapeSettings.textStyle": "Stil",
   "SSE.Views.ShapeSettings.textTexture": "Aus Textur",
-  "SSE.Views.ShapeSettings.textThemeColors": "Designfarben",
   "SSE.Views.ShapeSettings.textTile": "Kachel",
   "SSE.Views.ShapeSettings.txtBrownPaper": "Kraftpapier",
   "SSE.Views.ShapeSettings.txtCanvas": "Canvas",
@@ -851,11 +867,9 @@
   "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Blattname",
   "SSE.Views.Statusbar.textAverage": "MITTELWERT",
   "SSE.Views.Statusbar.textCount": "ANZAHL",
-  "SSE.Views.Statusbar.textNewColor": "Neue benutzerdefinierte Farbpalette hinzufügen",
+  "SSE.Views.Statusbar.textNewColor": "Benutzerdefinierte Farbe",
   "SSE.Views.Statusbar.textNoColor": "Ohne Farbe",
-  "SSE.Views.Statusbar.textStandartColors": "Standardfarben",
   "SSE.Views.Statusbar.textSum": "SUMME",
-  "SSE.Views.Statusbar.textThemeColors": "Designfarben",
   "SSE.Views.Statusbar.tipAccessRights": "Zugriffsrechte für das Dokument verwalten",
   "SSE.Views.Statusbar.tipAddTab": "Arbeitsblatt hinzufügen",
   "SSE.Views.Statusbar.tipFirst": "Bis zum ersten Blatt blättern",
@@ -917,6 +931,7 @@
   "SSE.Views.TextArtSettings.strSize": "Größe",
   "SSE.Views.TextArtSettings.strStroke": "Strich",
   "SSE.Views.TextArtSettings.strTransparency": "Undurchsichtigkeit",
+  "SSE.Views.TextArtSettings.strType": "Type",
   "SSE.Views.TextArtSettings.textBorderSizeErr": "Der eingegebene Wert ist falsch.<br>Bitte geben Sie einen Wert zwischen 0 pt und 1584 pt ein.",
   "SSE.Views.TextArtSettings.textColor": "Farbfüllung",
   "SSE.Views.TextArtSettings.textDirection": "Richtung",
@@ -927,17 +942,15 @@
   "SSE.Views.TextArtSettings.textGradientFill": "Füllung mit Farbverlauf",
   "SSE.Views.TextArtSettings.textImageTexture": "Bild oder Textur",
   "SSE.Views.TextArtSettings.textLinear": "Linear",
-  "SSE.Views.TextArtSettings.textNewColor": "Neue benutzerdefinierte Farbpalette hinzufügen",
+  "SSE.Views.TextArtSettings.textNewColor": "Benutzerdefinierte Farbe",
   "SSE.Views.TextArtSettings.textNoFill": "Ohne Füllung",
   "SSE.Views.TextArtSettings.textPatternFill": "Muster",
   "SSE.Views.TextArtSettings.textRadial": "Radial",
   "SSE.Views.TextArtSettings.textSelectTexture": "Wählen",
-  "SSE.Views.TextArtSettings.textStandartColors": "Standardfarben",
   "SSE.Views.TextArtSettings.textStretch": "Ausdehnung",
   "SSE.Views.TextArtSettings.textStyle": "Stil",
   "SSE.Views.TextArtSettings.textTemplate": "Vorlage",
   "SSE.Views.TextArtSettings.textTexture": "Aus Textur",
-  "SSE.Views.TextArtSettings.textThemeColors": "Designfarben",
   "SSE.Views.TextArtSettings.textTile": "Kachel",
   "SSE.Views.TextArtSettings.textTransform": "Transformieren\t",
   "SSE.Views.TextArtSettings.txtBrownPaper": "Kraftpapier",
@@ -989,7 +1002,7 @@
   "SSE.Views.Toolbar.textItalic": "Kursiv",
   "SSE.Views.Toolbar.textLeftBorders": "Rahmenlinien links",
   "SSE.Views.Toolbar.textMiddleBorders": "Innere horizontale Rahmenlinien",
-  "SSE.Views.Toolbar.textNewColor": "Neue benutzerdefinierte Farbpalette hinzufügen",
+  "SSE.Views.Toolbar.textNewColor": "Benutzerdefinierte Farbe",
   "SSE.Views.Toolbar.textNoBorders": "Keine Rahmen",
   "SSE.Views.Toolbar.textOutBorders": "Rahmenlinien außen",
   "SSE.Views.Toolbar.textPrint": "Drucken",
@@ -997,8 +1010,6 @@
   "SSE.Views.Toolbar.textRightBorders": "Rahmenlinien rechts",
   "SSE.Views.Toolbar.textRotateDown": "Text nach unten drehen",
   "SSE.Views.Toolbar.textRotateUp": "Text nach oben drehen",
-  "SSE.Views.Toolbar.textStandartColors": "Standardfarben",
-  "SSE.Views.Toolbar.textThemeColors": "Designfarben",
   "SSE.Views.Toolbar.textTopBorders": "Rahmenlinien oben",
   "SSE.Views.Toolbar.textUnderline": "Unterstrichen",
   "SSE.Views.Toolbar.textZoom": "Zoom",

apps/spreadsheeteditor/main/locale/en.json

@@ -74,6 +74,7 @@
   "Common.Views.DocumentAccessDialog.textTitle": "Sharing Settings",
   "Common.Views.Header.openNewTabText": "Open in New Tab",
   "Common.Views.Header.textBack": "Go to Documents",
+  "Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE",
   "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel",
   "Common.Views.ImageFromUrlDialog.okButtonText": "OK",
   "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:",
@@ -83,15 +84,15 @@
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtDelimiter": "Delimiter",
   "Common.Views.OpenDialog.txtEncoding": "Encoding ",
+  "Common.Views.OpenDialog.txtPassword": "Password",
   "Common.Views.OpenDialog.txtSpace": "Space",
   "Common.Views.OpenDialog.txtTab": "Tab",
   "Common.Views.OpenDialog.txtTitle": "Choose %1 options",
-  "Common.Views.OpenDialog.txtPassword": "Password",
   "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
+  "Common.Views.PluginDlg.textLoading": "Loading",
   "Common.Views.Plugins.strPlugins": "Plugins",
   "Common.Views.Plugins.textLoading": "Loading",
   "Common.Views.Plugins.textStart": "Start",
-  "Common.Views.PluginDlg.textLoading": "Loading",
   "SSE.Controllers.DocumentHolder.errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
   "SSE.Controllers.DocumentHolder.guestText": "Guest",
   "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning",
@@ -181,6 +182,7 @@
   "SSE.Controllers.Main.loadImageTitleText": "Loading Image",
   "SSE.Controllers.Main.loadingDocumentTitleText": "Loading spreadsheet",
   "SSE.Controllers.Main.notcriticalErrorTitle": "Warning",
+  "SSE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
   "SSE.Controllers.Main.openTextText": "Opening spreadsheet...",
   "SSE.Controllers.Main.openTitleText": "Opening Spreadsheet",
   "SSE.Controllers.Main.pastInMergeAreaError": "Cannot change part of a merged cell",
@@ -189,6 +191,7 @@
   "SSE.Controllers.Main.reloadButtonText": "Reload Page",
   "SSE.Controllers.Main.requestEditFailedMessageText": "Someone is editing this document right now. Please try again later.",
   "SSE.Controllers.Main.requestEditFailedTitleText": "Access denied",
+  "SSE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
   "SSE.Controllers.Main.savePreparingText": "Preparing to save",
   "SSE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...",
   "SSE.Controllers.Main.saveTextText": "Saving spreadsheet...",
@@ -207,6 +210,7 @@
   "SSE.Controllers.Main.textStrict": "Strict mode",
   "SSE.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.",
   "SSE.Controllers.Main.textYes": "Yes",
+  "SSE.Controllers.Main.titleLicenseExp": "License expired",
   "SSE.Controllers.Main.titleRecalcFormulas": "Calculating...",
   "SSE.Controllers.Main.txtArt": "Your text here",
   "SSE.Controllers.Main.txtBasicShapes": "Basic Shapes",
@@ -232,10 +236,9 @@
   "SSE.Controllers.Main.uploadImageTitleText": "Uploading Image",
   "SSE.Controllers.Main.warnBrowserIE9": "The application has low capabilities on IE9. Use IE10 or higher",
   "SSE.Controllers.Main.warnBrowserZoom": "Your browser current zoom setting is not fully supported. Please reset to the default zoom by pressing Ctrl+0.",
+  "SSE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "SSE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
-  "SSE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
-  "SSE.Controllers.Main.titleLicenseExp": "License expired",
   "SSE.Controllers.Print.strAllSheets": "All Sheets",
   "SSE.Controllers.Print.textWarning": "Warning",
   "SSE.Controllers.Print.warnCheckMargings": "Margins are incorrect",
@@ -303,7 +306,7 @@
   "SSE.Views.ChartSettings.textKeepRatio": "Constant Proportions",
   "SSE.Views.ChartSettings.textLine": "Line Chart",
   "SSE.Views.ChartSettings.textPie": "Pie Chart",
-  "SSE.Views.ChartSettings.textPoint": "Point Chart",
+  "SSE.Views.ChartSettings.textPoint": "XY (Scatter) Chart",
   "SSE.Views.ChartSettings.textSize": "Size",
   "SSE.Views.ChartSettings.textStock": "Stock Chart",
   "SSE.Views.ChartSettings.textStyle": "Style",
@@ -320,6 +323,7 @@
   "SSE.Views.ChartSettingsDlg.textBar": "Bar Chart",
   "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Between Tick Marks",
   "SSE.Views.ChartSettingsDlg.textBillions": "Billions",
+  "SSE.Views.ChartSettingsDlg.textBottom": "Bottom",
   "SSE.Views.ChartSettingsDlg.textCategoryName": "Category Name",
   "SSE.Views.ChartSettingsDlg.textCenter": "Center",
   "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Chart Elements &<br/>Chart Legend",
@@ -333,6 +337,7 @@
   "SSE.Views.ChartSettingsDlg.textDataRows": "in rows",
   "SSE.Views.ChartSettingsDlg.textDataSeries": "Data series",
   "SSE.Views.ChartSettingsDlg.textDisplayLegend": "Display Legend",
+  "SSE.Views.ChartSettingsDlg.textFit": "Fit to Width",
   "SSE.Views.ChartSettingsDlg.textFixed": "Fixed",
   "SSE.Views.ChartSettingsDlg.textGridLines": "Gridlines",
   "SSE.Views.ChartSettingsDlg.textHide": "Hide",
@@ -353,6 +358,7 @@
   "SSE.Views.ChartSettingsDlg.textLabelOptions": "Label Options",
   "SSE.Views.ChartSettingsDlg.textLabelPos": "Label Position",
   "SSE.Views.ChartSettingsDlg.textLayout": "Layout",
+  "SSE.Views.ChartSettingsDlg.textLeft": "Left",
   "SSE.Views.ChartSettingsDlg.textLeftOverlay": "Left Overlay",
   "SSE.Views.ChartSettingsDlg.textLegendBottom": "Bottom",
   "SSE.Views.ChartSettingsDlg.textLegendLeft": "Left",
@@ -383,6 +389,7 @@
   "SSE.Views.ChartSettingsDlg.textPie": "Pie Chart",
   "SSE.Views.ChartSettingsDlg.textPoint": "Point Chart",
   "SSE.Views.ChartSettingsDlg.textReverse": "Values in reverse order",
+  "SSE.Views.ChartSettingsDlg.textRight": "Right",
   "SSE.Views.ChartSettingsDlg.textRightOverlay": "Right Overlay",
   "SSE.Views.ChartSettingsDlg.textRotated": "Rotated",
   "SSE.Views.ChartSettingsDlg.textSelectData": "Select Data",
@@ -402,6 +409,7 @@
   "SSE.Views.ChartSettingsDlg.textThousands": "Thousands",
   "SSE.Views.ChartSettingsDlg.textTickOptions": "Tick Options",
   "SSE.Views.ChartSettingsDlg.textTitle": "Chart - Advanced Settings",
+  "SSE.Views.ChartSettingsDlg.textTop": "Top",
   "SSE.Views.ChartSettingsDlg.textTrillions": "Trillions",
   "SSE.Views.ChartSettingsDlg.textType": "Type",
   "SSE.Views.ChartSettingsDlg.textTypeData": "Type & Data",
@@ -414,11 +422,6 @@
   "SSE.Views.ChartSettingsDlg.textXAxisTitle": "X Axis Title",
   "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y Axis Title",
   "SSE.Views.ChartSettingsDlg.txtEmpty": "This field is required",
-  "SSE.Views.ChartSettingsDlg.textLeft": "Left",
-  "SSE.Views.ChartSettingsDlg.textRight": "Right",
-  "SSE.Views.ChartSettingsDlg.textTop": "Top",
-  "SSE.Views.ChartSettingsDlg.textBottom": "Bottom",
-  "SSE.Views.ChartSettingsDlg.textFit": "Fit Width",
   "SSE.Views.DigitalFilterDialog.cancelButtonText": "Cancel",
   "SSE.Views.DigitalFilterDialog.capAnd": "And",
   "SSE.Views.DigitalFilterDialog.capCondition1": "equals",

apps/spreadsheeteditor/main/locale/es.json

@@ -25,6 +25,8 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Reemplazar todo",
   "Common.UI.SynchronizeTip.textDontShow": "No volver a mostrar este mensaje",
   "Common.UI.SynchronizeTip.textSynchronize": "El documento ha sido cambiado por otro usuario.<br/>Por favor haga clic para guardar sus cambios y recargue las actualizaciones.",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Colores estándar",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Colores de tema",
   "Common.UI.Window.cancelButtonText": "Cancelar",
   "Common.UI.Window.closeButtonText": "Cerrar",
   "Common.UI.Window.noButtonText": "No",
@@ -81,10 +83,18 @@
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtDelimiter": "Delimitador",
   "Common.Views.OpenDialog.txtEncoding": "Codificación ",
+  "Common.Views.OpenDialog.txtPassword": "Password",
   "Common.Views.OpenDialog.txtSpace": "Espacio",
   "Common.Views.OpenDialog.txtTab": "Pestaña",
   "Common.Views.OpenDialog.txtTitle": "Elegir opciones de %1",
+  "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
+  "Common.Views.PluginDlg.textLoading": "Loading",
+  "Common.Views.Plugins.strPlugins": "Plugins",
+  "Common.Views.Plugins.textLoading": "Loading",
+  "Common.Views.Plugins.textStart": "Start",
+  "SSE.Controllers.DocumentHolder.errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
   "SSE.Controllers.DocumentHolder.guestText": "Visitante",
+  "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning",
   "SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Ancho de columna {0} símbolos ({1} píxeles)",
   "SSE.Controllers.DocumentHolder.textChangeRowHeight": "Altura de fila {0} puntos ({1} píxeles)",
   "SSE.Controllers.DocumentHolder.textCtrlClick": "Pulse CTRL y haga clic en el enlace",
@@ -157,6 +167,7 @@
   "SSE.Controllers.Main.errorUpdateVersion": "Se ha cambiado la versión del archivo. La página será actualizada.",
   "SSE.Controllers.Main.errorUserDrop": "No se puede acceder al archivo ahora.",
   "SSE.Controllers.Main.errorUsersExceed": "El número de usuarios permitido según su plan de precios fue excedido",
+  "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.",
   "SSE.Controllers.Main.errorWrongBracketsCount": "Un error en la fórmula introducida.<br>Número incorrecto de corchetes es usado.",
   "SSE.Controllers.Main.errorWrongOperator": "Un error en la fórmula introducida.Operador inválido es usado.<br>Por favor, corrija el error o utilice el botón Esc para cancelar la edición de fórmulas.",
   "SSE.Controllers.Main.leavePageText": "Usted tiene cambios no guardados en esta hoja de cálculo. Haga clic en 'Permanecer en esta página', después 'Guardar' para guardarlos. Haga clic en 'Abandonar esta página' para descartar todos los cambios no guardados.",
@@ -170,6 +181,7 @@
   "SSE.Controllers.Main.loadImageTitleText": "Cargando imagen",
   "SSE.Controllers.Main.loadingDocumentTitleText": "Cargando hoja de cálculo",
   "SSE.Controllers.Main.notcriticalErrorTitle": "Aviso",
+  "SSE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
   "SSE.Controllers.Main.openTextText": "Abriendo hoja de cálculo...",
   "SSE.Controllers.Main.openTitleText": "Abriendo hoja de cálculo",
   "SSE.Controllers.Main.pastInMergeAreaError": "No se puede cambiar parte de una celda combinada",
@@ -178,6 +190,7 @@
   "SSE.Controllers.Main.reloadButtonText": "Recargar página",
   "SSE.Controllers.Main.requestEditFailedMessageText": "Alguien está editando este documento en este momento. Por favor, inténtelo de nuevo más tarde.",
   "SSE.Controllers.Main.requestEditFailedTitleText": "Acceso negado",
+  "SSE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
   "SSE.Controllers.Main.savePreparingText": "Preparando para guardar",
   "SSE.Controllers.Main.savePreparingTitle": "Preparando para guardar.Espere por favor...",
   "SSE.Controllers.Main.saveTextText": "Guardando hoja de cálculo...",
@@ -196,6 +209,7 @@
   "SSE.Controllers.Main.textStrict": "Modo estricto",
   "SSE.Controllers.Main.textTryUndoRedo": "Las funciones Anular/Rehacer se desactivan para el modo co-edición rápido.<br>Haga Clic en el botón \"modo estricto\" para cambiar al modo de co-edición estricta para editar el archivo sin la interferencia de otros usuarios y enviar sus cambios sólo después de guardarlos. Se puede cambiar entre los modos de co-edición usando los ajustes avanzados de edición.",
   "SSE.Controllers.Main.textYes": "Sí",
+  "SSE.Controllers.Main.titleLicenseExp": "License expired",
   "SSE.Controllers.Main.titleRecalcFormulas": "Calculando...",
   "SSE.Controllers.Main.txtArt": "Su texto aquí",
   "SSE.Controllers.Main.txtBasicShapes": "Formas básicas",
@@ -221,6 +235,7 @@
   "SSE.Controllers.Main.uploadImageTitleText": "Subiendo imagen",
   "SSE.Controllers.Main.warnBrowserIE9": "Este aplicación tiene baja capacidad en IE9. Utilice IE10 o superior",
   "SSE.Controllers.Main.warnBrowserZoom": "La configuración actual de zoom de su navegador no está soportada por completo. Por favor restablezca zoom predeterminado pulsando Ctrl+0.",
+  "SSE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "SSE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "SSE.Controllers.Main.warnProcessRightsChange": "El derecho de edición del archivo es denegado.",
   "SSE.Controllers.Print.strAllSheets": "Todas las hojas",
@@ -307,6 +322,7 @@
   "SSE.Views.ChartSettingsDlg.textBar": "Gráfico de barras",
   "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Entre marcas de graduación",
   "SSE.Views.ChartSettingsDlg.textBillions": "Millardos",
+  "SSE.Views.ChartSettingsDlg.textBottom": "Bottom",
   "SSE.Views.ChartSettingsDlg.textCategoryName": "Nombre de categoría",
   "SSE.Views.ChartSettingsDlg.textCenter": "Al centro",
   "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Elementos de gráfico y <br/>leyenda de gráfico",
@@ -320,6 +336,7 @@
   "SSE.Views.ChartSettingsDlg.textDataRows": "en filas",
   "SSE.Views.ChartSettingsDlg.textDataSeries": "Serie de datos",
   "SSE.Views.ChartSettingsDlg.textDisplayLegend": "Mostrar Leyenda",
+  "SSE.Views.ChartSettingsDlg.textFit": "Fit to Width",
   "SSE.Views.ChartSettingsDlg.textFixed": "Corregido",
   "SSE.Views.ChartSettingsDlg.textGridLines": "Líneas de cuadrícula",
   "SSE.Views.ChartSettingsDlg.textHide": "Ocultar",
@@ -340,6 +357,7 @@
   "SSE.Views.ChartSettingsDlg.textLabelOptions": "Parámetros de etiqueta",
   "SSE.Views.ChartSettingsDlg.textLabelPos": "Posición de etiqueta",
   "SSE.Views.ChartSettingsDlg.textLayout": "Diseño",
+  "SSE.Views.ChartSettingsDlg.textLeft": "Left",
   "SSE.Views.ChartSettingsDlg.textLeftOverlay": "Superposición a la izquierda",
   "SSE.Views.ChartSettingsDlg.textLegendBottom": "Inferior",
   "SSE.Views.ChartSettingsDlg.textLegendLeft": "Izquierdo",
@@ -370,6 +388,7 @@
   "SSE.Views.ChartSettingsDlg.textPie": "Gráfico circular",
   "SSE.Views.ChartSettingsDlg.textPoint": "Gráfico de Punto",
   "SSE.Views.ChartSettingsDlg.textReverse": "Valores en orden inverso",
+  "SSE.Views.ChartSettingsDlg.textRight": "Right",
   "SSE.Views.ChartSettingsDlg.textRightOverlay": "Superposición a la derecha",
   "SSE.Views.ChartSettingsDlg.textRotated": "Girado",
   "SSE.Views.ChartSettingsDlg.textSelectData": "Selección de datos",
@@ -389,6 +408,7 @@
   "SSE.Views.ChartSettingsDlg.textThousands": "Miles",
   "SSE.Views.ChartSettingsDlg.textTickOptions": "Parámetros de marcas de graduación",
   "SSE.Views.ChartSettingsDlg.textTitle": "Gráfico- Ajustes avanzados",
+  "SSE.Views.ChartSettingsDlg.textTop": "Top",
   "SSE.Views.ChartSettingsDlg.textTrillions": "Billones",
   "SSE.Views.ChartSettingsDlg.textType": "Tipo",
   "SSE.Views.ChartSettingsDlg.textTypeData": "Tipo y datos",
@@ -454,6 +474,8 @@
   "SSE.Views.DocumentHolder.txtAddNamedRange": "Definir Nombre",
   "SSE.Views.DocumentHolder.txtArrange": "Arreglar",
   "SSE.Views.DocumentHolder.txtAscending": "Ascendente",
+  "SSE.Views.DocumentHolder.txtAutoColumnWidth": "Auto Fit Column Width",
+  "SSE.Views.DocumentHolder.txtAutoRowHeight": "Auto Fit Row Height",
   "SSE.Views.DocumentHolder.txtClear": "Limpiar",
   "SSE.Views.DocumentHolder.txtClearAll": "Todo",
   "SSE.Views.DocumentHolder.txtClearComments": "Comentarios",
@@ -463,6 +485,8 @@
   "SSE.Views.DocumentHolder.txtColumn": "Toda la columna",
   "SSE.Views.DocumentHolder.txtColumnWidth": "Ancho de columna",
   "SSE.Views.DocumentHolder.txtCopy": "Copiar",
+  "SSE.Views.DocumentHolder.txtCustomColumnWidth": "Custom Column Width",
+  "SSE.Views.DocumentHolder.txtCustomRowHeight": "Custom Row Height",
   "SSE.Views.DocumentHolder.txtCut": "Cortar",
   "SSE.Views.DocumentHolder.txtDelete": "Borrar",
   "SSE.Views.DocumentHolder.txtDescending": "Descendente",
@@ -613,6 +637,8 @@
   "SSE.Views.HyperlinkSettingsDialog.textTitle": "Configuración de hiperenlace",
   "SSE.Views.HyperlinkSettingsDialog.txtEmpty": "Este campo es obligatorio",
   "SSE.Views.HyperlinkSettingsDialog.txtNotUrl": "El campo debe ser URL en el formato \"http://www.example.com\"",
+  "SSE.Views.ImageSettings.textEdit": "Edit",
+  "SSE.Views.ImageSettings.textEditObject": "Edit Object",
   "SSE.Views.ImageSettings.textFromFile": "De archivo",
   "SSE.Views.ImageSettings.textFromUrl": "De URL",
   "SSE.Views.ImageSettings.textHeight": "Altura",
@@ -625,6 +651,7 @@
   "SSE.Views.LeftMenu.tipChat": "Chat",
   "SSE.Views.LeftMenu.tipComments": "Comentarios",
   "SSE.Views.LeftMenu.tipFile": "Archivo",
+  "SSE.Views.LeftMenu.tipPlugins": "Plugins",
   "SSE.Views.LeftMenu.tipSearch": "Buscar",
   "SSE.Views.LeftMenu.tipSupport": "Feedback y Soporte",
   "SSE.Views.MainSettingsPrint.okButtonText": "Guardar",
@@ -773,6 +800,7 @@
   "SSE.Views.ShapeSettings.strSize": "Tamaño",
   "SSE.Views.ShapeSettings.strStroke": "Trazo",
   "SSE.Views.ShapeSettings.strTransparency": "Opacidad ",
+  "SSE.Views.ShapeSettings.strType": "Type",
   "SSE.Views.ShapeSettings.textAdvanced": "Mostrar ajustes avanzados",
   "SSE.Views.ShapeSettings.textBorderSizeErr": "El valor numérico es incorrecto.<br>Por favor, introduzca un valor de 0 a 1584 puntos.",
   "SSE.Views.ShapeSettings.textColor": "Color de relleno",
@@ -790,11 +818,9 @@
   "SSE.Views.ShapeSettings.textPatternFill": "Patrón",
   "SSE.Views.ShapeSettings.textRadial": "Radial",
   "SSE.Views.ShapeSettings.textSelectTexture": "Seleccionar",
-  "SSE.Views.ShapeSettings.textStandartColors": "Colores estándar",
   "SSE.Views.ShapeSettings.textStretch": "Estirar",
   "SSE.Views.ShapeSettings.textStyle": "Estilo",
   "SSE.Views.ShapeSettings.textTexture": "De textura",
-  "SSE.Views.ShapeSettings.textThemeColors": "Colores de tema",
   "SSE.Views.ShapeSettings.textTile": "Mosaico",
   "SSE.Views.ShapeSettings.txtBrownPaper": "Papel marrón",
   "SSE.Views.ShapeSettings.txtCanvas": "Lienzo",
@@ -853,9 +879,7 @@
   "SSE.Views.Statusbar.textCount": "CANTIDAD",
   "SSE.Views.Statusbar.textNewColor": "Añadir Color Personalizado Nuevo",
   "SSE.Views.Statusbar.textNoColor": "Sin color",
-  "SSE.Views.Statusbar.textStandartColors": "Colores estándar",
   "SSE.Views.Statusbar.textSum": "SUMA",
-  "SSE.Views.Statusbar.textThemeColors": "Colores de tema",
   "SSE.Views.Statusbar.tipAccessRights": "Administrar los derechos de acceso de documentos",
   "SSE.Views.Statusbar.tipAddTab": "Añadir hoja de cálculo",
   "SSE.Views.Statusbar.tipFirst": "Desplazar hasta la primera hoja",
@@ -917,6 +941,7 @@
   "SSE.Views.TextArtSettings.strSize": "Tamaño",
   "SSE.Views.TextArtSettings.strStroke": "Trazo",
   "SSE.Views.TextArtSettings.strTransparency": "Opacidad ",
+  "SSE.Views.TextArtSettings.strType": "Type",
   "SSE.Views.TextArtSettings.textBorderSizeErr": "El valor numérico es incorrecto.<br>Por favor, introduzca un valor de 0 a 1584 puntos.",
   "SSE.Views.TextArtSettings.textColor": "Color de relleno",
   "SSE.Views.TextArtSettings.textDirection": "Direction",
@@ -932,12 +957,10 @@
   "SSE.Views.TextArtSettings.textPatternFill": "Patrón",
   "SSE.Views.TextArtSettings.textRadial": "Radial",
   "SSE.Views.TextArtSettings.textSelectTexture": "Select",
-  "SSE.Views.TextArtSettings.textStandartColors": "Colores estándar",
   "SSE.Views.TextArtSettings.textStretch": "Estirar",
   "SSE.Views.TextArtSettings.textStyle": "Estilo",
   "SSE.Views.TextArtSettings.textTemplate": "Plantilla",
   "SSE.Views.TextArtSettings.textTexture": "De textura",
-  "SSE.Views.TextArtSettings.textThemeColors": "Colores de tema",
   "SSE.Views.TextArtSettings.textTile": "Mosaico",
   "SSE.Views.TextArtSettings.textTransform": "Transformar",
   "SSE.Views.TextArtSettings.txtBrownPaper": "Papel marrón",
@@ -997,8 +1020,6 @@
   "SSE.Views.Toolbar.textRightBorders": "Bordes derechos",
   "SSE.Views.Toolbar.textRotateDown": "Girar texto hacia abajo",
   "SSE.Views.Toolbar.textRotateUp": "Girar texto hacia arriba",
-  "SSE.Views.Toolbar.textStandartColors": "Colores estándar",
-  "SSE.Views.Toolbar.textThemeColors": "Colores de tema",
   "SSE.Views.Toolbar.textTopBorders": "Bordes superiores",
   "SSE.Views.Toolbar.textUnderline": "Subrayar",
   "SSE.Views.Toolbar.textZoom": "Zoom",

apps/spreadsheeteditor/main/locale/fr.json

@@ -25,6 +25,8 @@
   "Common.UI.SearchDialog.txtBtnReplaceAll": "Remplacer tout",
   "Common.UI.SynchronizeTip.textDontShow": "N'afficher plus ce message",
   "Common.UI.SynchronizeTip.textSynchronize": "Le document a été modifié par un autre utilisateur.<br/>Cliquez pour enregistrer vos modifications et recharger les mises à jour.",
+  "Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard",
+  "Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème",
   "Common.UI.Window.cancelButtonText": "Annuler",
   "Common.UI.Window.closeButtonText": "Fermer",
   "Common.UI.Window.noButtonText": "Non",
@@ -81,10 +83,18 @@
   "Common.Views.OpenDialog.okButtonText": "OK",
   "Common.Views.OpenDialog.txtDelimiter": "Délimiteur",
   "Common.Views.OpenDialog.txtEncoding": "Encodage",
+  "Common.Views.OpenDialog.txtPassword": "Password",
   "Common.Views.OpenDialog.txtSpace": "Espace",
   "Common.Views.OpenDialog.txtTab": "Onglet",
   "Common.Views.OpenDialog.txtTitle": "Choisir %1 des options ",
+  "Common.Views.OpenDialog.txtTitleProtected": "Protected File",
+  "Common.Views.PluginDlg.textLoading": "Loading",
+  "Common.Views.Plugins.strPlugins": "Plugins",
+  "Common.Views.Plugins.textLoading": "Loading",
+  "Common.Views.Plugins.textStart": "Start",
+  "SSE.Controllers.DocumentHolder.errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
   "SSE.Controllers.DocumentHolder.guestText": "Invité",
+  "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning",
   "SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Largeur de colonne {0} symboles ({1} pixels)",
   "SSE.Controllers.DocumentHolder.textChangeRowHeight": "Hauteur de ligne {0} points ({1} pixels)",
   "SSE.Controllers.DocumentHolder.textCtrlClick": "Appuyez sur Ctrl et cliquez sur le lien",
@@ -157,6 +167,7 @@
   "SSE.Controllers.Main.errorUpdateVersion": "La version du fichier a été changée. La page sera rechargée.",
   "SSE.Controllers.Main.errorUserDrop": "Impossible d'accéder au fichier",
   "SSE.Controllers.Main.errorUsersExceed": "Le nombre d'utilisateurs autorisés par le plan tarifaire a été dépassé",
+  "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,<br>but will not be able to download until the connection is restored.",
   "SSE.Controllers.Main.errorWrongBracketsCount": "Une erreur dans la formule entrée.<br>Nombre utilisé entre parenthèses est incorrect.",
   "SSE.Controllers.Main.errorWrongOperator": "Une erreur dans la formule entrée.<br>Opérateur utilisé est incorrect.<br>Veuillez corriger l'erreur ou utilisez le bouton Esc pour annuler l'édition de formule.",
   "SSE.Controllers.Main.leavePageText": "Vous avez des modifications non enregistrées dans cette feuille de calcul. Cliquez sur 'Rester sur cette page ' ensuite 'Enregistrer' pour les enregistrer. Cliquez sur 'Quitter cette page' pour annuler toutes les modifications non enregistrées.",
@@ -170,6 +181,7 @@
   "SSE.Controllers.Main.loadImageTitleText": "Chargement d'une image",
   "SSE.Controllers.Main.loadingDocumentTitleText": "Chargement feuille de calcul",
   "SSE.Controllers.Main.notcriticalErrorTitle": "Avertissement",
+  "SSE.Controllers.Main.openErrorText": "An error has occurred while opening the file",
   "SSE.Controllers.Main.openTextText": "Ouverture de la feuille de calcul en cours...",
   "SSE.Controllers.Main.openTitleText": "Ouverture de la feuille de calcul",
   "SSE.Controllers.Main.pastInMergeAreaError": "Impossible de modifier une partie d'une cellule fusionnée",
@@ -178,6 +190,7 @@
   "SSE.Controllers.Main.reloadButtonText": "Recharger la page",
   "SSE.Controllers.Main.requestEditFailedMessageText": "Quelqu'un est en train de modifier ce document. Veuillez réessayer plus tard.",
   "SSE.Controllers.Main.requestEditFailedTitleText": "Accès refusé",
+  "SSE.Controllers.Main.saveErrorText": "An error has occurred while saving the file",
   "SSE.Controllers.Main.savePreparingText": "Préparation à l'enregistrement ",
   "SSE.Controllers.Main.savePreparingTitle": "Préparation à l'enregistrement en cours. Veuillez patienter...",
   "SSE.Controllers.Main.saveTextText": "Enregistrement de la feuille de calcul en cours ...",
@@ -196,6 +209,7 @@
   "SSE.Controllers.Main.textStrict": "Mode strict",
   "SSE.Controllers.Main.textTryUndoRedo": "Les fonctions annuler/rétablir sont désactivées pour le mode de co-édition rapide.<br>Cliquez sur le bouton \"Mode strict\" pour passer au mode de la co-édition stricte pour modifier le fichier sans interférence d'autres utilisateurs et envoyer vos modifications seulement après que vous les enregistrez. Vous pouvez basculer entre les modes de co-édition à l'aide de paramètres avancés d'éditeur.",
   "SSE.Controllers.Main.textYes": "Oui",
+  "SSE.Controllers.Main.titleLicenseExp": "License expired",
   "SSE.Controllers.Main.titleRecalcFormulas": "Calcul en cours...",
   "SSE.Controllers.Main.txtArt": "Votre texte ici",
   "SSE.Controllers.Main.txtBasicShapes": "Formes de base",
@@ -221,6 +235,7 @@
   "SSE.Controllers.Main.uploadImageTitleText": "Chargement d'une image",
   "SSE.Controllers.Main.warnBrowserIE9": "L'application est peu compatible avec IE9. Utilisez IE10 ou version plus récente",
   "SSE.Controllers.Main.warnBrowserZoom": "Le paramètre actuel de zoom de votre navigateur n'est pas accepté. Veuillez rétablir le niveau de zoom par défaut en appuyant sur Ctrl+0.",
+  "SSE.Controllers.Main.warnLicenseExp": "Your license has expired.<br>Please update your license and refresh the page.",
   "SSE.Controllers.Main.warnNoLicense": "You are using an open source version of ONLYOFFICE. The version has limitations for concurrent connections to the document server (20 connections at a time).<br>If you need more please consider purchasing a commercial license.",
   "SSE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.",
   "SSE.Controllers.Print.strAllSheets": "Toutes les feuilles",
@@ -307,6 +322,7 @@
   "SSE.Views.ChartSettingsDlg.textBar": "Diagramme à barres",
   "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Entre graduations",
   "SSE.Views.ChartSettingsDlg.textBillions": "Milliards",
+  "SSE.Views.ChartSettingsDlg.textBottom": "Bottom",
   "SSE.Views.ChartSettingsDlg.textCategoryName": "Nom de la catégorie",
   "SSE.Views.ChartSettingsDlg.textCenter": "Au centre",
   "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Éléments de graphique,<br/>légende de graphique",
@@ -320,6 +336,7 @@
   "SSE.Views.ChartSettingsDlg.textDataRows": "en lignes",
   "SSE.Views.ChartSettingsDlg.textDataSeries": "Série de données",
   "SSE.Views.ChartSettingsDlg.textDisplayLegend": "Afficher une légende",
+  "SSE.Views.ChartSettingsDlg.textFit": "Fit to Width",
   "SSE.Views.ChartSettingsDlg.textFixed": "Corrigé",
   "SSE.Views.ChartSettingsDlg.textGridLines": "Quadrillage",
   "SSE.Views.ChartSettingsDlg.textHide": "Masquer",
@@ -340,6 +357,7 @@
   "SSE.Views.ChartSettingsDlg.textLabelOptions": "Options d'étiquettes",
   "SSE.Views.ChartSettingsDlg.textLabelPos": "Position de l'étiquette",
   "SSE.Views.ChartSettingsDlg.textLayout": "Disposition",
+  "SSE.Views.ChartSettingsDlg.textLeft": "Left",
   "SSE.Views.ChartSettingsDlg.textLeftOverlay": "Superposition à gauche",
   "SSE.Views.ChartSettingsDlg.textLegendBottom": "En bas",
   "SSE.Views.ChartSettingsDlg.textLegendLeft": "A gauche",
@@ -370,6 +388,7 @@
   "SSE.Views.ChartSettingsDlg.textPie": "Graphiques à secteurs",
   "SSE.Views.ChartSettingsDlg.textPoint": "Diagramme de dispersion",
   "SSE.Views.ChartSettingsDlg.textReverse": "Valeurs en ordre inverse",
+  "SSE.Views.ChartSettingsDlg.textRight": "Right",
   "SSE.Views.ChartSettingsDlg.textRightOverlay": "Superposition à droite",
   "SSE.Views.ChartSettingsDlg.textRotated": "Incliné",
   "SSE.Views.ChartSettingsDlg.textSelectData": "Sélectionner des données",
@@ -389,6 +408,7 @@
   "SSE.Views.ChartSettingsDlg.textThousands": "Milliers",
   "SSE.Views.ChartSettingsDlg.textTickOptions": "Cochez les options",
   "SSE.Views.ChartSettingsDlg.textTitle": "Graphique - Paramètres avancés",
+  "SSE.Views.ChartSettingsDlg.textTop": "Top",
   "SSE.Views.ChartSettingsDlg.textTrillions": "Trillions",
   "SSE.Views.ChartSettingsDlg.textType": "Type",
   "SSE.Views.ChartSettingsDlg.textTypeData": "Type et données",
@@ -454,6 +474,8 @@
   "SSE.Views.DocumentHolder.txtAddNamedRange": "Définir un nom",
   "SSE.Views.DocumentHolder.txtArrange": "Organiser",
   "SSE.Views.DocumentHolder.txtAscending": "Croissant",
+  "SSE.Views.DocumentHolder.txtAutoColumnWidth": "Auto Fit Column Width",
+  "SSE.Views.DocumentHolder.txtAutoRowHeight": "Auto Fit Row Height",
   "SSE.Views.DocumentHolder.txtClear": "Effacer",
   "SSE.Views.DocumentHolder.txtClearAll": "Tout",
   "SSE.Views.DocumentHolder.txtClearComments": "Commentaires",
@@ -463,6 +485,8 @@
   "SSE.Views.DocumentHolder.txtColumn": "Colonne entière",
   "SSE.Views.DocumentHolder.txtColumnWidth": "Largeur de colonne",
   "SSE.Views.DocumentHolder.txtCopy": "Copier",
+  "SSE.Views.DocumentHolder.txtCustomColumnWidth": "Custom Column Width",
+  "SSE.Views.DocumentHolder.txtCustomRowHeight": "Custom Row Height",
   "SSE.Views.DocumentHolder.txtCut": "Couper",
   "SSE.Views.DocumentHolder.txtDelete": "Supprimer",
   "SSE.Views.DocumentHolder.txtDescending": "Décroissant",
@@ -613,6 +637,8 @@
   "SSE.Views.HyperlinkSettingsDialog.textTitle": "Paramètres du lien hypertexte",
   "SSE.Views.HyperlinkSettingsDialog.txtEmpty": "Ce champ est obligatoire",
   "SSE.Views.HyperlinkSettingsDialog.txtNotUrl": "Ce champ doit contenir une URL au format \"http://www.example.com\"",
+  "SSE.Views.ImageSettings.textEdit": "Edit",
+  "SSE.Views.ImageSettings.textEditObject": "Edit Object",
   "SSE.Views.ImageSettings.textFromFile": "D'un fichier",
   "SSE.Views.ImageSettings.textFromUrl": "D'une URL",
   "SSE.Views.ImageSettings.textHeight": "Hauteur",
@@ -625,6 +651,7 @@
   "SSE.Views.LeftMenu.tipChat": "Chat",
   "SSE.Views.LeftMenu.tipComments": "Commentaires",
   "SSE.Views.LeftMenu.tipFile": "Fichier",
+  "SSE.Views.LeftMenu.tipPlugins": "Plugins",
   "SSE.Views.LeftMenu.tipSearch": "Rechercher",
   "SSE.Views.LeftMenu.tipSupport": "Commentaires & assistance",
   "SSE.Views.MainSettingsPrint.okButtonText": "Enregistrer",
@@ -773,6 +800,7 @@
   "SSE.Views.ShapeSettings.strSize": "Taille",
   "SSE.Views.ShapeSettings.strStroke": "Trait",
   "SSE.Views.ShapeSettings.strTransparency": "Opacité",
+  "SSE.Views.ShapeSettings.strType": "Type",
   "SSE.Views.ShapeSettings.textAdvanced": "Afficher les paramètres avancés",
   "SSE.Views.ShapeSettings.textBorderSizeErr": "La valeur saisie est incorrecte. <br>Entrez une valeur de 0 à 1584 points.",
   "SSE.Views.ShapeSettings.textColor": "Couleur de remplissage",
@@ -790,11 +818,9 @@
   "SSE.Views.ShapeSettings.textPatternFill": "Modèle",
   "SSE.Views.ShapeSettings.textRadial": "Radial",
   "SSE.Views.ShapeSettings.textSelectTexture": "Sélectionner",
-  "SSE.Views.ShapeSettings.textStandartColors": "Couleurs standard",
   "SSE.Views.ShapeSettings.textStretch": "Prolonger",
   "SSE.Views.ShapeSettings.textStyle": "Style",
   "SSE.Views.ShapeSettings.textTexture": "D'une texture",
-  "SSE.Views.ShapeSettings.textThemeColors": "Couleurs de thème",
   "SSE.Views.ShapeSettings.textTile": "Tuile",
   "SSE.Views.ShapeSettings.txtBrownPaper": "Papier brun",
   "SSE.Views.ShapeSettings.txtCanvas": "Toile",
@@ -851,11 +877,9 @@
   "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Nom de la feuille",
   "SSE.Views.Statusbar.textAverage": "MOYENNE",
   "SSE.Views.Statusbar.textCount": "COMPTE",
-  "SSE.Views.Statusbar.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "SSE.Views.Statusbar.textNewColor": "Couleur Personnalisée",
   "SSE.Views.Statusbar.textNoColor": "Pas de couleur",
-  "SSE.Views.Statusbar.textStandartColors": "Couleurs standard",
   "SSE.Views.Statusbar.textSum": "SOMME",
-  "SSE.Views.Statusbar.textThemeColors": "Couleurs de thème",
   "SSE.Views.Statusbar.tipAccessRights": "Gérez des droits d'accès aux documents ",
   "SSE.Views.Statusbar.tipAddTab": "Ajouter feuille de calcul",
   "SSE.Views.Statusbar.tipFirst": "Faire défiler vers la première feuille de calcul",
@@ -917,6 +941,7 @@
   "SSE.Views.TextArtSettings.strSize": "Taille",
   "SSE.Views.TextArtSettings.strStroke": "Stroke",
   "SSE.Views.TextArtSettings.strTransparency": "Opacité",
+  "SSE.Views.TextArtSettings.strType": "Type",
   "SSE.Views.TextArtSettings.textBorderSizeErr": "La valeur saisie est incorrecte. <br>Entrez une valeur de 0 à 1584 points.",
   "SSE.Views.TextArtSettings.textColor": "Couleur de remplissage",
   "SSE.Views.TextArtSettings.textDirection": "Direction",
@@ -927,17 +952,15 @@
   "SSE.Views.TextArtSettings.textGradientFill": "Remplissage en dégradé",
   "SSE.Views.TextArtSettings.textImageTexture": "Image ou texture",
   "SSE.Views.TextArtSettings.textLinear": "Linéaire",
-  "SSE.Views.TextArtSettings.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "SSE.Views.TextArtSettings.textNewColor": "Couleur Personnalisée",
   "SSE.Views.TextArtSettings.textNoFill": "Pas de remplissage",
   "SSE.Views.TextArtSettings.textPatternFill": "Modèle",
   "SSE.Views.TextArtSettings.textRadial": "Radial",
   "SSE.Views.TextArtSettings.textSelectTexture": "Sélectionner",
-  "SSE.Views.TextArtSettings.textStandartColors": "Couleurs standard",
   "SSE.Views.TextArtSettings.textStretch": "Prolonger",
   "SSE.Views.TextArtSettings.textStyle": "Style",
   "SSE.Views.TextArtSettings.textTemplate": "Modèle",
   "SSE.Views.TextArtSettings.textTexture": "D'une texture",
-  "SSE.Views.TextArtSettings.textThemeColors": "Couleurs de thème",
   "SSE.Views.TextArtSettings.textTile": "Tuile",
   "SSE.Views.TextArtSettings.textTransform": "Transformer",
   "SSE.Views.TextArtSettings.txtBrownPaper": "Papier brun",
@@ -989,7 +1012,7 @@
   "SSE.Views.Toolbar.textItalic": "Italique",
   "SSE.Views.Toolbar.textLeftBorders": "Bordures gauches",
   "SSE.Views.Toolbar.textMiddleBorders": "Bordures intérieures horizontales",
-  "SSE.Views.Toolbar.textNewColor": "Ajouter Nouvelle Couleur Personnalisée",
+  "SSE.Views.Toolbar.textNewColor": "Couleur Personnalisée",
   "SSE.Views.Toolbar.textNoBorders": "Pas de bordures",
   "SSE.Views.Toolbar.textOutBorders": "Bordures extérieures",
   "SSE.Views.Toolbar.textPrint": "Imprimer",
@@ -997,8 +1020,6 @@
   "SSE.Views.Toolbar.textRightBorders": "Bordures droites",
   "SSE.Views.Toolbar.textRotateDown": "Rotation du texte vers le bas",
   "SSE.Views.Toolbar.textRotateUp": "Rotation du texte vers le haut",
-  "SSE.Views.Toolbar.textStandartColors": "Couleurs standard",
-  "SSE.Views.Toolbar.textThemeColors": "Couleurs de thème",
   "SSE.Views.Toolbar.textTopBorders": "Bordures supérieures",
   "SSE.Views.Toolbar.textUnderline": "Souligné",
   "SSE.Views.Toolbar.textZoom": "Zoom",

apps/spreadsheeteditor/mobile/app/controller/toolbar/View.js

@@ -73,6 +73,24 @@
     launch: function() {
         this.callParent(arguments);
 
+        if (Ext.os.is.iOS) {
+            Ext.each(Ext.ComponentQuery.query('button'), function(button) {
+                button.element.dom.ontouchstart = Ext.emptyFn();
+                button.element.dom.ontouchmove = Ext.emptyFn();
+                button.element.dom.ontouchend = Ext.emptyFn();
+            }, this);
+
+            Ext.each(Ext.ComponentQuery.query('toolbar'), function(toolbar) {
+                var preventFn = function(e){
+                    e.preventDefault();
+                };
+
+                toolbar.element.dom.ontouchstart = preventFn;
+                toolbar.element.dom.ontouchmove = preventFn;
+                toolbar.element.dom.ontouchend = preventFn;
+            }, this);
+        }
+
         Common.Gateway.on('init', Ext.bind(this.loadConfig, this));
     },
 

apps/spreadsheeteditor/mobile/resources/sass/_application-base.scss

@@ -18,18 +18,36 @@ $icons-default-size         : 24px;
 $icons-default-image-width  : 72px;
 $icons-default-image-height : 624px;
 
-@import 'sencha-touch/default/all';
+@import 'sencha-touch/default';
 
-@include sencha-panel;
+@import 'sencha-touch/default/src/Class';
-@include sencha-buttons;
+@import 'sencha-touch/default/src/Button';
-@include sencha-toolbar;
+@import 'sencha-touch/default/src/Panel';
-@include sencha-toolbar-forms;
+@import 'sencha-touch/default/src/Sheet';
-@include sencha-indexbar;
+@import 'sencha-touch/default/src/MessageBox';
-@include sencha-list;
+@import 'sencha-touch/default/src/Toolbar';
-@include sencha-layout;
+@import 'sencha-touch/default/src/Toast';
-@include sencha-form;
+@import 'sencha-touch/default/src/Menu';
-@include sencha-msgbox;
+//@import 'sencha-touch/default/src/carousel/Carousel';
-@include sencha-loading-spinner;
+@import 'sencha-touch/default/src/form/Panel';
+@import 'sencha-touch/default/src/form/FieldSet';
+@import 'sencha-touch/default/src/field/Field';
+@import 'sencha-touch/default/src/field/Checkbox';
+@import 'sencha-touch/default/src/field/Radio';
+@import 'sencha-touch/default/src/field/Search';
+@import 'sencha-touch/default/src/field/Select';
+//@import 'sencha-touch/default/src/field/Slider';
+//@import 'sencha-touch/default/src/field/Spinner';
+//@import 'sencha-touch/default/src/field/TextArea';
+//@import 'sencha-touch/default/src/dataview/IndexBar';
+@import 'sencha-touch/default/src/dataview/List';
+//@import 'sencha-touch/default/src/picker/Picker';
+//@import 'sencha-touch/default/src/plugin/ListPaging';
+//@import 'sencha-touch/default/src/plugin/PullRefresh';
+//@import 'sencha-touch/default/src/slider/Slider';
+@import 'sencha-touch/default/src/slider/Toggle';
+//@import 'sencha-touch/default/src/tab/Panel';
+//@import 'sencha-touch/default/src/grid/Grid';
 
 @import 'common-buttons';
 @import 'common-dataview';
@@ -48,32 +66,32 @@ $icons-default-image-height : 624px;
 @include common-toolbar-ui('edit', $base-color);
 @include common-toolbar-ui('search', $base-color);
 
-@include application-icon-normal('save',          0);
+//@include application-icon-normal('save',          0);
-@include application-icon-normal('undo',          1);
+//@include application-icon-normal('undo',          1);
 @include application-icon-normal('share',         2);
-@include application-icon-normal('font-style',    3);
+//@include application-icon-normal('font-style',    3);
-@include application-icon-normal('font-color',    4);
+//@include application-icon-normal('font-color',    4);
-@include application-icon-normal('bold',          5);
+//@include application-icon-normal('bold',          5);
-@include application-icon-normal('italic',        6);
+//@include application-icon-normal('italic',        6);
-@include application-icon-normal('underline',     7);
+//@include application-icon-normal('underline',     7);
-@include application-icon-normal('align-left',    8);
+//@include application-icon-normal('align-left',    8);
-@include application-icon-normal('align-center',  9);
+//@include application-icon-normal('align-center',  9);
-@include application-icon-normal('align-right',   10);
+//@include application-icon-normal('align-right',   10);
-@include application-icon-normal('align-fill',    11);
+//@include application-icon-normal('align-fill',    11);
 @include application-icon-normal('pages',         12);
 @include application-icon-normal('search-prev',   13);
 @include application-icon-normal('search-next',   14);
-@include application-icon-normal('insert',        15);
+//@include application-icon-normal('insert',        15);
 @include application-icon-normal('search',        16);
 @include application-icon-normal('fullscreen',    17);
-@include application-icon-normal('spinner-down',  18);
+//@include application-icon-normal('spinner-down',  18);
-@include application-icon-normal('spinner-up',    19);
+//@include application-icon-normal('spinner-up',    19);
-@include application-icon-normal('table',         20);
+//@include application-icon-normal('table',         20);
-@include application-icon-normal('picture',       21);
+//@include application-icon-normal('picture',       21);
-@include application-icon-normal('insert-row',    22);
+//@include application-icon-normal('insert-row',    22);
-@include application-icon-normal('insert-column', 23);
+//@include application-icon-normal('insert-column', 23);
-@include application-icon-normal('textbigger',    24);
+//@include application-icon-normal('textbigger',    24);
-@include application-icon-normal('textless',      25);
+//@include application-icon-normal('textless',      25);
 
 
 @include common-button-ui('base',       $base-color);

apps/spreadsheeteditor/mobile/resources/sass/config.rb

@@ -4,8 +4,12 @@ dir = File.dirname(__FILE__)
 # Load the sencha-touch framework automatically.
 load File.join(dir, '..', '..', '..', '..', '..', 'vendor', 'touch', 'resources', 'themes')
 
+# Add include path for command styles
+add_import_path File.join(dir, '..', '..', '..', '..', '..', 'apps', 'common', 'mobile', 'resources', 'sass')
+
 # Compass configurations
 sass_path    = dir
 css_path     = File.join(dir, "..", "css")
+fonts_path   = File.join(dir, '..', '..', '..', '..', '..', 'apps', 'common', 'mobile', 'resources', 'fonts')
 environment  = :production
 output_style = :compressed

vendor/touch/SETUP.html

@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<head>
+<style>
+h1 {font-family: Calibri; font-size: 18pt;}
+h2 {font-family: Calibri; font-size: 14pt;}
+h3 {font-family: Calibri; font-size: 12pt;}
+body {font-family: Calibri; font-size: 11pt;}
+</style>
+</head>
+
+<body style="width: 700px">
+	<a href="http://sencha.com"><span style="left: 50px"></span><img src="SenchaLogo.png" width="110" height="40" /></a>
+<h1>Sencha Touch Setup Guide</h1>
+<p><b>Topics:</b></p>
+<ul>
+	<li><a href="Intro">Introduction</a></li>
+	<li><a href="Install">Installing Sencha Touch</a></li>
+	<li><a href="Info">Sencha Touch Information</a></li>
+</ul>
+<a name="Intro"></a>
+<h2>Introduction</h2>
+<p>Sencha Touch, a high-performance HTML5 mobile application framework, is the cornerstone 
+	of the Sencha HTML5 platform. Built for enabling world-class user experiences, 
+	Sencha Touch is the only framework that enables developers to build powerful apps 
+	that work on iOS, Android, BlackBerry, Windows Phone, and Internet Explorer 10. 
+	<br>Learn more at <a href="http://docs.sencha.com/touch/#!/guide/whats_new">What's New</a>.
+	<br>Learn about new APIs in the "New in this version" 
+	section near the end of the <a href="http://docs.sencha.com/touch/#!/api">API page</a>.</p>
+
+<a name="Install"></a>
+<h2>Installing Sencha Touch</h2>
+<p>To install Sencha Touch:</p>
+<ol>
+	<li>Download <a href="http://www.sencha.com/products/sencha-cmd/download">Sencha Cmd</a>. 
+		Sencha Cmd enables you to publish, package, and simulate an application, as well as to upgrade Sencha software. 
+		Sencha Cmd also installs Apache Ant, Compass, and Sass.</li>
+	<li>Download <a href="http://www.ruby-lang.org/en/downloads/">Ruby</a> 
+		<ul>
+		<li><b>Mac OS</b>: Ruby is pre-installed. You can verify 
+		it with the <b>ruby -v</b> command.</li>
+		<li><b>Windows</b> Download the open source <a href="http://www.7-zip.org">7-Zip</a> archiver. 
+		Download Ruby (any version) from <a href="http://rubyinstaller.org/downloads/">rubyinstaller.org</a>. 
+		Set the Path environment variable to point to the directory in which you unzip the installer file.</li>
+ 		<li><b>Ubuntu</b>: Use <b>sudo apt-get install ruby2.0.0</b> to download and install Ruby.</li>
+		</ul>
+	</li>
+	<li>Start your web server. 
+		If using the Sencha Cmd web server, change directory to where you want to serve 
+		your application, open a new command line window and start the server with the
+		<b>sencha&nbsp;web&nbsp;start</b> command. You can stop the server by typing
+		CTRL+c or opening another command line and typing the <b>sencha&nbsp;web&nbsp;stop</b> command.
+		You can access the Sencha Cmd web server using
+		the <code>http://localhost:1841/&lt;app_name&gt;</code> URL.</li>
+	<li>If you are using Windows and running the IIS web server, add "application/x-json" 
+		as a MIME type; otherwise, IIS returns the JSON file with an error when you preview
+		your project. In Windows, enable IIS from the add/remove programs or programs and features dialog 
+		(add/remove windows features), you can also add extra functionality by downloading the web platform 
+		toolkit to make config of IIS features extra simple. 
+		For information on adding this MIME type, see this 
+		<a href="http://stackoverflow.com/a/1121114/273985">Stackoverflow article</a>.</li>
+	<li>Use a modern web browser such as 
+		<a href="https://www.google.com/intl/en/chrome/browser">Chrome</a> 
+		or <a href="http://www.apple.com/safari/">Safari</a>.</li>	
+</ol>	
+
+<a name="Info"></a>
+<h2>Sencha Touch Information</h2>
+<ul>
+<li><a href="http://sencha.com/">Sencha.com</a></li>
+<li><a href="http://docs.sencha.com/">Sencha Documentation</a></li>
+<li><a href="release-notes.html">Sencha Touch Release Notes</a></li>
+<li><a href="examples/">Sencha Touch Examples</a></li>
+<li><a href="http://www.sencha.com/products/touch-bundle/">Sencha Touch Bundle</a></li>
+<li><a href="http://www.sencha.com/training/">Sencha Training</a></li>
+<li><a href="http://www.sencha.com/support/">Sencha Support</a></li>
+</ul>
+</body>
+</html>

vendor/touch/index.html

@@ -6,12 +6,7 @@
         <title>Welcome to Sencha Touch 2</title>
 
         <script type="text/javascript">
-            var mobile = (/iphone|ipad|ipod|android|blackberry|mini|windows\sce|palm/i.test(navigator.userAgent.toLowerCase()));
-            if (mobile) {
             window.location = "examples/";
-            } else {
-                window.location = "docs/";
-            }
         </script>
     </head>
     <body></body>

vendor/touch/license.txt

@@ -1,5 +1,5 @@
 Sencha Touch & Sencha Touch Charts - JavaScript Libraries
-Copyright (c) 2010-2012, Sencha, Inc.
+Copyright (c) 2010-2015, Sencha, Inc.
 All rights reserved.
 licensing@sencha.com
 

vendor/touch/microloader/development.js

@@ -0,0 +1,185 @@
+/**
+ * Sencha Blink - Development
+ * @author Jacky Nguyen <jacky@sencha.com>
+ */
+(function() {
+    var head = document.head;
+
+    function write(content) {
+        document.write(content);
+    }
+
+    function addMeta(name, content) {
+        var meta = document.createElement('meta');
+
+        meta.setAttribute('name', name);
+        meta.setAttribute('content', content);
+        head.appendChild(meta);
+    }
+
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', 'app.json', false);
+    xhr.send(null);
+
+    var options = eval("(" + xhr.responseText + ")"),
+        scripts = options.js || [],
+        styleSheets = options.css || [],
+        i, ln, path, platform, theme, exclude;
+
+    if(options.platform && options.platforms && options.platforms[options.platform] && options.platforms[options.platform].js) {
+        scripts = options.platforms[options.platform].js.concat(scripts);
+    }
+
+    if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
+        var msViewportStyle = document.createElement("style");
+        msViewportStyle.appendChild(
+            document.createTextNode(
+                "@media screen and (orientation: portrait) {" +
+                    "@-ms-viewport {width: 320px !important;}" +
+                "}" +
+                "@media screen and (orientation: landscape) {" +
+                    "@-ms-viewport {width: 560px !important;}" +
+                "}"
+            )
+        );
+        document.getElementsByTagName("head")[0].appendChild(msViewportStyle);
+    }
+
+    addMeta('viewport', 'width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no');
+    addMeta('apple-mobile-web-app-capable', 'yes');
+    addMeta('apple-touch-fullscreen', 'yes');
+
+    if (!window.Ext) {
+        window.Ext = {};
+    }
+    Ext.microloaded = true;
+
+    var filterPlatform = window.Ext.filterPlatform = function(platform) {
+        var profileMatch = false,
+            ua = navigator.userAgent,
+            j, jln;
+
+        platform = [].concat(platform);
+
+        function isPhone(ua) {
+            var isMobile = /Mobile(\/|\s)/.test(ua);
+
+            // Either:
+            // - iOS but not iPad
+            // - Android 2
+            // - Android with "Mobile" in the UA
+
+            return /(iPhone|iPod)/.test(ua) ||
+                      (!/(Silk)/.test(ua) && (/(Android)/.test(ua) && (/(Android 2)/.test(ua) || isMobile))) ||
+                      (/(BlackBerry|BB)/.test(ua) && isMobile) ||
+                      /(Windows Phone)/.test(ua);
+        }
+
+        function isTablet(ua) {
+            return !isPhone(ua) && (/iPad/.test(ua) || /Android|Silk/.test(ua) || /(RIM Tablet OS)/.test(ua) ||
+                (/MSIE 10/.test(ua) && /; Touch/.test(ua)));
+        }
+
+        // Check if the ?platform parameter is set in the URL
+        var paramsString = window.location.search.substr(1),
+            paramsArray = paramsString.split("&"),
+            params = {},
+            testPlatform, i;
+
+        for (i = 0; i < paramsArray.length; i++) {
+            var tmpArray = paramsArray[i].split("=");
+            params[tmpArray[0]] = tmpArray[1];
+        }
+
+        testPlatform = params.platform;
+        if (testPlatform) {
+            return platform.indexOf(testPlatform) != -1;
+        }
+
+        for (j = 0, jln = platform.length; j < jln; j++) {
+            switch (platform[j]) {
+                case 'phone':
+                    profileMatch = isPhone(ua);
+                    break;
+                case 'tablet':
+                    profileMatch = isTablet(ua);
+                    break;
+                case 'desktop':
+                    profileMatch = !isPhone(ua) && !isTablet(ua);
+                    break;
+                case 'ios':
+                    profileMatch = /(iPad|iPhone|iPod)/.test(ua);
+                    break;
+                case 'android':
+                    profileMatch = /(Android|Silk)/.test(ua);
+                    break;
+                case 'blackberry':
+                    profileMatch = /(BlackBerry|BB)/.test(ua);
+                    break;
+                case 'safari':
+                    profileMatch = /Safari/.test(ua) && !(/(BlackBerry|BB)/.test(ua));
+                    break;
+                case 'chrome':
+                    profileMatch = /Chrome/.test(ua);
+                    break;
+                case 'ie10':
+                    profileMatch = /MSIE 10/.test(ua);
+                    break;
+                case 'windows':
+                    profileMatch = /MSIE 10/.test(ua) || /Trident/.test(ua);
+                    break;
+                case 'tizen':
+                    profileMatch = /Tizen/.test(ua);
+                    break;
+                case 'firefox':
+                    profileMatch = /Firefox/.test(ua);
+            }
+            if (profileMatch) {
+                return true;
+            }
+        }
+        return false;
+    };
+
+
+    for (i = 0,ln = styleSheets.length; i < ln; i++) {
+        path = styleSheets[i];
+
+        if (typeof path != 'string') {
+            platform = path.platform;
+            exclude = path.exclude;
+            theme = path.theme;
+            path = path.path;
+        }
+
+        if (platform) {
+            if (!filterPlatform(platform) || filterPlatform(exclude)) {
+                continue;
+            }
+            Ext.theme = {
+                name: theme || 'Default'
+            };
+        }
+
+        write('<link rel="stylesheet" href="'+path+'">');
+    }
+
+    for (i = 0,ln = scripts.length; i < ln; i++) {
+        path = scripts[i];
+
+        if (typeof path != 'string') {
+            platform = path.platform;
+            exclude = path.exclude;
+            path = path.path;
+        }
+
+        if (platform) {
+            if (!filterPlatform(platform) || filterPlatform(exclude)) {
+                continue;
+            }
+        }
+
+        write('<script src="'+path+'"></'+'script>');
+    }
+
+})();

vendor/touch/microloader/production.js

@@ -0,0 +1,742 @@
+/**
+ * Sencha Blink
+ * @author Jacky Nguyen <jacky@sencha.com>
+ */
+(function(global) {
+    var emptyFn = function(){},
+        callbacks = [],
+        doc = global.document,
+        head = doc.head,
+        addWindowListener = global.addEventListener,
+        removeWindowListener = global.removeEventListener,
+        jsonParse = JSON.parse,
+        a = doc.createElement('a'),
+        documentLocation = doc.location,
+        documentUri = documentLocation.protocol + '//' + documentLocation.hostname + documentLocation.pathname + documentLocation.search,
+        manifestFile = 'app.json',
+        isRefreshing = false,
+        activeManifest, appCache, storage;
+
+    try {
+        storage = global.localStorage;
+        appCache = global.applicationCache;
+    }
+    catch(e) {}
+
+    function getManifestStorageKey(id) {
+        return id + '-' + documentUri + manifestFile;
+    }
+
+    function Manifest(manifest) {
+        var manifestContent;
+
+        if (typeof manifest == 'string') {
+            manifestContent = manifest;
+            manifest = jsonParse(manifestContent);
+        }
+        else {
+            manifestContent = JSON.stringify(manifest);
+        }
+
+        var applicationId = manifest.id,
+            key = getManifestStorageKey(applicationId),
+            assetMap = {};
+
+        function processAsset(asset) {
+            var uri;
+
+            if (typeof asset == 'string') {
+                asset = {
+                    path: asset
+                };
+            }
+
+            if (asset.shared) {
+                asset.version = asset.shared;
+                uri = asset.shared + asset.path;
+            }
+            else {
+                uri = toAbsoluteUri(asset.path);
+            }
+
+            asset.uri = uri;
+            asset.key = applicationId + '-' + uri;
+            assetMap[uri] = asset;
+
+            return asset;
+        }
+
+        function processAssets(assets, type) {
+            var ln = assets.length,
+                i, asset;
+
+            for (i = 0; i < ln; i++) {
+                asset = assets[i];
+
+                assets[i] = asset = processAsset(asset);
+
+                asset.type = type;
+                asset.index = i;
+                asset.collection = assets;
+                asset.ready = false;
+                asset.evaluated = false;
+            }
+
+            return assets;
+        }
+
+        this.key = key;
+        this.css = processAssets(manifest.css, 'css');
+        this.js = processAssets(manifest.js, 'js');
+
+        Ext.microloaded = true;
+
+        var filterPlatform = window.Ext.filterPlatform = function(platform) {
+            var profileMatch = false,
+                ua = navigator.userAgent,
+                j, jln;
+
+            platform = [].concat(platform);
+
+            function isPhone(ua) {
+                var isMobile = /Mobile(\/|\s)/.test(ua);
+
+                // Either:
+                // - iOS but not iPad
+                // - Android 2
+                // - Android with "Mobile" in the UA
+
+                return /(iPhone|iPod)/.test(ua) ||
+                          (!/(Silk)/.test(ua) && (/(Android)/.test(ua) && (/(Android 2)/.test(ua) || isMobile))) ||
+                          (/(BlackBerry|BB)/.test(ua) && isMobile) ||
+                          /(Windows Phone)/.test(ua);
+            }
+
+            function isTablet(ua) {
+                return !isPhone(ua) && (/iPad/.test(ua) || /Android|Silk/.test(ua) || /(RIM Tablet OS)/.test(ua) ||
+                    (/MSIE 10/.test(ua) && /; Touch/.test(ua)));
+            }
+
+            // Check if the ?platform parameter is set in the URL
+            var paramsString = window.location.search.substr(1),
+                paramsArray = paramsString.split("&"),
+                params = {},
+                testPlatform, i;
+
+            for (i = 0; i < paramsArray.length; i++) {
+                var tmpArray = paramsArray[i].split("=");
+                params[tmpArray[0]] = tmpArray[1];
+            }
+
+            testPlatform = params.platform;
+            if (testPlatform) {
+                return platform.indexOf(testPlatform) != -1;
+            }
+
+            for (j = 0, jln = platform.length; j < jln; j++) {
+                switch (platform[j]) {
+                    case 'phone':
+                        profileMatch = isPhone(ua);
+                        break;
+                    case 'tablet':
+                        profileMatch = isTablet(ua);
+                        break;
+                    case 'desktop':
+                        profileMatch = !isPhone(ua) && !isTablet(ua);
+                        break;
+                    case 'ios':
+                        profileMatch = /(iPad|iPhone|iPod)/.test(ua);
+                        break;
+                    case 'android':
+                        profileMatch = /(Android|Silk)/.test(ua);
+                        break;
+                    case 'blackberry':
+                        profileMatch = /(BlackBerry|BB)/.test(ua);
+                        break;
+                    case 'safari':
+                        profileMatch = /Safari/.test(ua) && !(/(BlackBerry|BB)/.test(ua));
+                        break;
+                    case 'chrome':
+                        profileMatch = /Chrome/.test(ua);
+                        break;
+                    case 'ie10':
+                        profileMatch = /MSIE 10/.test(ua);
+                        break;
+                    case 'windows':
+                        profileMatch = /MSIE 10/.test(ua) || /Trident/.test(ua);
+                        break;
+                    case 'tizen':
+                        profileMatch = /Tizen/.test(ua);
+                        break;
+                    case 'firefox':
+                        profileMatch = /Firefox/.test(ua);
+                }
+                if (profileMatch) {
+                    return true;
+                }
+            }
+            return false;
+        };
+
+        this.css = this.css.filter(function(css) {
+            var platform = css.platform,
+                exclude = css.exclude;
+
+            if (platform) {
+                if (filterPlatform(platform) && !filterPlatform(exclude)) {
+                    Ext.theme = {
+                        name: css.theme || 'Default'
+                    };
+                    return true;
+                }
+                css.filtered = true;
+                return false;
+            }
+            return true;
+        });
+
+        this.js = this.js.filter(function(js) {
+            var platform = js.platform,
+                exclude = js.exclude;
+
+            if (platform) {
+                if (filterPlatform(platform) && !filterPlatform(exclude)) {
+                    return true;
+                }
+                else {
+                    js.filtered = true;
+                    return false;
+                }
+            }
+            return true;
+        });
+
+        this.assets = this.css.concat(this.js);
+        this.getAsset = function(uri) {
+            return assetMap[uri];
+        };
+        this.store = function() {
+            store(key, manifestContent);
+        };
+    }
+
+    if (typeof global.Ext === 'undefined') {
+        var Ext = global.Ext = {};
+    }
+
+    function toAbsoluteUri(uri) {
+        a.href = uri;
+        return a.href;
+    }
+
+    function addMeta(name, content) {
+        var meta = document.createElement('meta');
+
+        meta.setAttribute('name', name);
+        meta.setAttribute('content', content);
+        head.appendChild(meta);
+    }
+
+    function request(uri, isShared, onSuccess, onFailure) {
+        (isShared ? requestIframe : requestXhr)(uri, onSuccess, onFailure);
+    }
+
+    function requestXhr(uri, onSuccess, onFailure) {
+        var xhr = new XMLHttpRequest();
+
+        onFailure = onFailure || emptyFn;
+
+        uri = uri + ((uri.indexOf('?') == -1) ? '?' : '&') + Date.now();
+
+        try {
+            xhr.open('GET', uri, true);
+            xhr.onreadystatechange = function() {
+                if (xhr.readyState == 4) {
+                    var status = xhr.status,
+                        content = xhr.responseText;
+
+                    if ((status >= 200 && status < 300) || status == 304 || (status == 0 && content.length > 0)) {
+                        onSuccess(content);
+                    }
+                    else {
+                        onFailure();
+                    }
+                }
+            };
+            xhr.send(null);
+        } catch (e) {
+            onFailure();
+        }
+    }
+
+    function requestIframe(uri, onSuccess) {
+        var iframe = doc.createElement('iframe');
+
+        callbacks.push({
+            iframe: iframe,
+            callback: onSuccess
+        });
+
+        iframe.src = uri + '.html';
+        iframe.style.cssText = 'width:0;height:0;border:0;position:absolute;z-index:-999;visibility:hidden';
+        doc.body.appendChild(iframe);
+    }
+
+    function requestAsset(asset, onSuccess, onFailure) {
+        var isRemote = !!asset.remote,
+            isShared = !!asset.shared;
+
+        if (isRemote) {
+            onSuccess('');
+            return;
+        }
+
+        if (!isShared) {
+            var onRequestSuccess = onSuccess,
+                version = asset.version,
+                versionLn = version.length,
+                checksumFail, checksumType;
+
+            onSuccess = function(content) {
+                checksumType = content.substring(0, 1);
+                if (checksumType == '/') {
+                    if (content.substring(2, versionLn + 2) !== version) {
+                        checksumFail = true;
+                    }
+                }
+                else if (checksumType == 'f') {
+                    if (content.substring(9, versionLn + 9) !== version) {
+                        checksumFail = true;
+                    }
+                }
+                else if (checksumType == '.') {
+                    if (content.substring(1, versionLn + 1) !== version) {
+                        checksumFail = true;
+                    }
+                }
+                if (checksumFail === true) {
+                    if (confirm("Requested: '" + asset.uri + " seems to have been changed. Attempt to refresh the application?")) {
+                        refresh();
+                    }
+                    return;
+                }
+                onRequestSuccess(content);
+            };
+        }
+
+        request(asset.uri, isShared, onSuccess, onFailure);
+    }
+
+    function onMessage(e) {
+        var data = e.data,
+            sourceWindow = e.source.window,
+            i, ln, callback, iframe;
+
+        for (i = 0, ln = callbacks.length; i < ln; i++) {
+            callback = callbacks[i];
+            iframe = callback.iframe;
+
+            if (iframe.contentWindow === sourceWindow) {
+                callback.callback(data);
+                doc.body.removeChild(iframe);
+                callbacks.splice(i, 1);
+                return;
+            }
+        }
+    }
+
+    function patch(content, delta) {
+        var output = [],
+            chunk, i, ln;
+
+        if (delta.length === 0) {
+            return content;
+        }
+
+        for (i = 0,ln = delta.length; i < ln; i++) {
+            chunk = delta[i];
+
+            if (typeof chunk === 'number') {
+                output.push(content.substring(chunk, chunk + delta[++i]));
+            }
+            else {
+                output.push(chunk);
+            }
+        }
+
+        return output.join('');
+    }
+
+    function log(message) {
+        if (typeof console != 'undefined') {
+            (console.error || console.log).call(console, message);
+        }
+    }
+
+    function store(key, value) {
+        try {
+            storage.setItem(key, value);
+        }
+        catch (e) {
+            if (storage && e.code == e.QUOTA_EXCEEDED_ERR && activeManifest) {
+                log("LocalStorage Quota exceeded, cannot store " + key + " locally");
+                // Quota exceeded, clean up unused items
+//                var items = activeManifest.assets.map(function(asset) {
+//                        return asset.key;
+//                    }),
+//                    i = 0,
+//                    ln = storage.length,
+//                    cleaned = false,
+//                    item;
+//
+//                items.push(activeManifest.key);
+//
+//                while (i <= ln - 1) {
+//                    item = storage.key(i);
+//
+//                    if (items.indexOf(item) == -1) {
+//                        storage.removeItem(item);
+//                        cleaned = true;
+//                        ln--;
+//                    }
+//                    else {
+//                        i++;
+//                    }
+//                }
+
+                // Done cleaning up, attempt to store the value again
+                // If there's still not enough space, no other choice
+                // but to skip this item from being stored
+//                if (cleaned) {
+//                    store(key, value);
+//                }
+            }
+        }
+    }
+
+    function retrieve(key) {
+        try {
+            return storage.getItem(key);
+        }
+        catch (e) {
+            // Private browsing mode
+            return null;
+        }
+    }
+
+    function retrieveAsset(asset) {
+        return retrieve(asset.key);
+    }
+
+    function storeAsset(asset, content) {
+        return store(asset.key, content);
+    }
+
+    function refresh() {
+        if (!isRefreshing) {
+            isRefreshing = true;
+            requestXhr(manifestFile, function(content) {
+                new Manifest(content).store();
+                global.location.reload();
+            });
+        }
+    }
+
+    function blink(currentManifest) {
+        var currentAssets = currentManifest.assets,
+            assetsCount = currentAssets.length,
+            newManifest;
+
+        activeManifest = currentManifest;
+
+        addWindowListener('message', onMessage, false);
+
+        function onAssetReady(asset, content) {
+            var assets = asset.collection,
+                index = asset.index,
+                ln = assets.length,
+                i;
+
+            asset.ready = true;
+            asset.content = content;
+
+            for (i = index - 1; i >= 0; i--) {
+                asset = assets[i];
+                if (!asset.filtered && (!asset.ready || !asset.evaluated)) {
+                    return;
+                }
+            }
+
+            for (i = index; i < ln; i++) {
+                asset = assets[i];
+                if (asset.ready) {
+                    if (!asset.evaluated) {
+                        evaluateAsset(asset);
+                    }
+                }
+                else {
+                    return;
+                }
+            }
+        }
+
+        function evaluateAsset(asset) {
+            asset.evaluated = true;
+
+            if (asset.type == 'js') {
+                try {
+                    eval(asset.content);
+                }
+                catch (e) {
+                    log("Error evaluating " + asset.uri + " with message: " + e);
+                }
+            }
+            else {
+                var style = doc.createElement('style'),
+                    base;
+
+                style.type = 'text/css';
+                style.textContent = asset.content;
+
+                if ('id' in asset) {
+                    style.id = asset.id;
+                }
+
+                if ('disabled' in asset) {
+                    style.disabled = asset.disabled;
+                }
+
+                base = document.createElement('base');
+                base.href = asset.path.replace(/\/[^\/]*$/, '/');
+                head.appendChild(base);
+                head.appendChild(style);
+                head.removeChild(base);
+            }
+
+            delete asset.content;
+
+            if (--assetsCount == 0) {
+                onReady();
+            }
+        }
+
+        function onReady() {
+            var updatingAssets = [],
+                appCacheReady = false,
+                onAppCacheIdle = function() {},
+                onAppCacheReady = function() {
+                    appCache.swapCache();
+                    appCacheReady = true;
+                    onAppCacheIdle();
+                },
+                updatingCount;
+
+            removeWindowListener('message', onMessage, false);
+
+            if (appCache.status == appCache.UPDATEREADY) {
+                onAppCacheReady();
+            }
+            else if (appCache.status == appCache.CHECKING || appCache.status == appCache.DOWNLOADING) {
+                appCache.onupdateready = onAppCacheReady;
+                appCache.onnoupdate = appCache.onobsolete = function() {
+                    onAppCacheIdle();
+                };
+            }
+
+            function notifyUpdateIfAppCacheReady() {
+                if (appCacheReady) {
+                    notifyUpdate();
+                }
+            }
+
+            function notifyUpdate() {
+                var updatedCallback = Ext.onUpdated || emptyFn;
+
+                if ('onSetup' in Ext) {
+                    Ext.onSetup(updatedCallback);
+                }
+                else {
+                    updatedCallback();
+                }
+            }
+
+            function doUpdate() {
+                newManifest.store();
+
+                updatingAssets.forEach(function(asset) {
+                    storeAsset(asset, asset.content);
+                });
+
+                notifyUpdate();
+            }
+
+            function onAssetUpdated(asset, content) {
+                asset.content = content;
+
+                if (--updatingCount == 0) {
+                    if (appCache.status == appCache.IDLE) {
+                        doUpdate();
+                    }
+                    else {
+                        onAppCacheIdle = doUpdate;
+                    }
+                }
+            }
+
+            function checkForUpdate() {
+                removeWindowListener('online', checkForUpdate, false);
+                requestXhr(manifestFile, function(manifestContent) {
+                    activeManifest = newManifest = new Manifest(manifestContent);
+
+                    var assets = newManifest.assets,
+                        currentAsset;
+
+                    assets.forEach(function(asset) {
+                        currentAsset = currentManifest.getAsset(asset.uri);
+
+                        if (!currentAsset || asset.version !== currentAsset.version) {
+                            updatingAssets.push(asset);
+                        }
+                    });
+
+                    updatingCount = updatingAssets.length;
+
+                    if (updatingCount == 0) {
+                        if (appCache.status == appCache.IDLE) {
+                            notifyUpdateIfAppCacheReady();
+                        }
+                        else {
+                            onAppCacheIdle = notifyUpdateIfAppCacheReady;
+                        }
+                        return;
+                    }
+
+                    updatingAssets.forEach(function(asset) {
+                        var currentAsset = currentManifest.getAsset(asset.uri),
+                            path = asset.path,
+                            update = asset.update;
+
+                        function updateFull() {
+                            requestAsset(asset, function(content) {
+                                onAssetUpdated(asset, content);
+                            });
+                        }
+
+                        // New asset (never used before)
+                        // OR Shared from CDN
+                        // OR Missing local storage
+                        // OR Full update
+                        if (!currentAsset || !update || retrieveAsset(asset) === null || update != 'delta') {
+                            updateFull();
+                        }
+                        else {
+                            requestXhr('deltas/' + path + '/' + currentAsset.version + '.json',
+                                function(content) {
+                                    try {
+                                        onAssetUpdated(asset, patch(retrieveAsset(asset), jsonParse(content)));
+                                    }
+                                    catch (e) {
+                                        log("Malformed delta content received for " + asset.uri);
+                                    }
+                                },
+                                updateFull
+                            );
+                        }
+                    })
+                });
+            }
+
+            if (navigator.onLine !== false) {
+                checkForUpdate();
+            }
+            else {
+                addWindowListener('online', checkForUpdate, false);
+            }
+        }
+
+        if (assetsCount == 0) {
+            onReady();
+            return;
+        }
+
+        currentAssets.forEach(function(asset) {
+            var content = retrieveAsset(asset);
+
+            if (content === null) {
+                requestAsset(asset, function(content) {
+                    if (!asset.remote) {
+                        storeAsset(asset, content);
+                    }
+                    onAssetReady(asset, content);
+                }, function() {
+                    onAssetReady(asset, '');
+                });
+            }
+            else {
+                onAssetReady(asset, content);
+            }
+        });
+    }
+
+    function blinkOnDomReady(manifest) {
+        if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
+            var msViewportStyle = document.createElement("style");
+            msViewportStyle.appendChild(
+                document.createTextNode(
+                    "@media screen and (orientation: portrait) {" +
+                        "@-ms-viewport {width: 320px !important;}" +
+                    "}" +
+                    "@media screen and (orientation: landscape) {" +
+                        "@-ms-viewport {width: 560px !important;}" +
+                    "}"
+                )
+            );
+            document.getElementsByTagName("head")[0].appendChild(msViewportStyle);
+        }
+
+        var readyStateRe =  (/MSIE 10/.test(navigator.userAgent)) ? /complete|loaded/ : /interactive|complete|loaded/;
+        if (doc.readyState.match(readyStateRe) !== null) {
+            blink(manifest);
+        }
+        else {
+            addWindowListener('DOMContentLoaded', function() {
+                if (navigator.standalone) {
+                    // When running from Home Screen, the splash screen will not disappear until all
+                    // external resource requests finish.
+                    // The first timeout clears the splash screen
+                    // The second timeout allows inital HTML content to be displayed
+                    setTimeout(function() {
+                        setTimeout(function() {
+                            blink(manifest);
+                        }, 1);
+                    }, 1);
+                }
+                else {
+                  setTimeout(function() {
+                    blink(manifest);
+                  }, 1);
+                }
+            }, false);
+        }
+    }
+
+    Ext.blink = function(manifest) {
+        var manifestContent = retrieve(getManifestStorageKey(manifest.id));
+
+        addMeta('viewport', 'width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no');
+        addMeta('apple-mobile-web-app-capable', 'yes');
+        addMeta('apple-touch-fullscreen', 'yes');
+
+        if (manifestContent) {
+            manifest = new Manifest(manifestContent);
+            blinkOnDomReady(manifest);
+        }
+        else {
+            requestXhr(manifestFile, function(content) {
+                manifest = new Manifest(content);
+                manifest.store();
+                blinkOnDomReady(manifest);
+            });
+        }
+    };
+})(this);

vendor/touch/microloader/testing.js

@@ -0,0 +1,177 @@
+/**
+ * Sencha Blink - Testing
+ * @author Jacky Nguyen <jacky@sencha.com>
+ */
+(function(global) {
+    var head = global.document.head,
+        Ext = global.Ext;
+
+    if (typeof Ext == 'undefined') {
+        global.Ext = Ext = {};
+    }
+
+    function write(content) {
+        document.write(content);
+    }
+
+    function addMeta(name, content) {
+        var meta = document.createElement('meta');
+
+        meta.setAttribute('name', name);
+        meta.setAttribute('content', content);
+        head.appendChild(meta);
+    }
+
+    Ext.blink = function(options) {
+        var scripts = options.js || [],
+            styleSheets = options.css || [],
+            i, ln, path, platform, theme;
+
+        if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
+            var msViewportStyle = document.createElement("style");
+            msViewportStyle.appendChild(
+                document.createTextNode(
+                    "@media screen and (orientation: portrait) {" +
+                        "@-ms-viewport {width: 320px !important;}" +
+                    "}" +
+                    "@media screen and (orientation: landscape) {" +
+                        "@-ms-viewport {width: 560px !important;}" +
+                    "}"
+                )
+            );
+            document.getElementsByTagName("head")[0].appendChild(msViewportStyle);
+        }
+        addMeta('viewport', 'width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no');
+        addMeta('apple-mobile-web-app-capable', 'yes');
+        addMeta('apple-touch-fullscreen', 'yes');
+
+        Ext.microloaded = true;
+
+        var filterPlatform = window.Ext.filterPlatform = function(platform) {
+            var profileMatch = false,
+                ua = navigator.userAgent,
+                j, jln, exclude;
+
+            platform = [].concat(platform);
+
+            function isPhone(ua) {
+                var isMobile = /Mobile(\/|\s)/.test(ua);
+
+                // Either:
+                // - iOS but not iPad
+                // - Android 2
+                // - Android with "Mobile" in the UA
+
+                return /(iPhone|iPod)/.test(ua) ||
+                          (!/(Silk)/.test(ua) && (/(Android)/.test(ua) && (/(Android 2)/.test(ua) || isMobile))) ||
+                          (/(BlackBerry|BB)/.test(ua) && isMobile) ||
+                          /(Windows Phone)/.test(ua);
+            }
+
+            function isTablet(ua) {
+                return !isPhone(ua) && (/iPad/.test(ua) || /Android|Silk/.test(ua) || /(RIM Tablet OS)/.test(ua) ||
+                    (/MSIE 10/.test(ua) && /; Touch/.test(ua)));
+            }
+
+            // Check if the ?platform parameter is set in the URL
+            var paramsString = window.location.search.substr(1),
+                paramsArray = paramsString.split("&"),
+                params = {},
+                testPlatform, i;
+
+            for (i = 0; i < paramsArray.length; i++) {
+                var tmpArray = paramsArray[i].split("=");
+                params[tmpArray[0]] = tmpArray[1];
+            }
+
+            testPlatform = params.platform;
+            if (testPlatform) {
+                return platform.indexOf(testPlatform) != -1;
+            }
+
+            for (j = 0, jln = platform.length; j < jln; j++) {
+                switch (platform[j]) {
+                    case 'phone':
+                        profileMatch = isPhone(ua);
+                        break;
+                    case 'tablet':
+                        profileMatch = isTablet(ua);
+                        break;
+                    case 'desktop':
+                        profileMatch = !isPhone(ua) && !isTablet(ua);
+                        break;
+                    case 'ios':
+                        profileMatch = /(iPad|iPhone|iPod)/.test(ua);
+                        break;
+                    case 'android':
+                        profileMatch = /(Android|Silk)/.test(ua);
+                        break;
+                    case 'blackberry':
+                        profileMatch = /(BlackBerry|BB)/.test(ua);
+                        break;
+                    case 'safari':
+                        profileMatch = /Safari/.test(ua) && !(/(BlackBerry|BB)/.test(ua));
+                        break;
+                    case 'chrome':
+                        profileMatch = /Chrome/.test(ua);
+                        break;
+                    case 'ie10':
+                        profileMatch = /MSIE 10/.test(ua);
+                        break;
+                    case 'windows':
+                        profileMatch = /MSIE 10/.test(ua) || /Trident/.test(ua);
+                        break;
+                    case 'tizen':
+                        profileMatch = /Tizen/.test(ua);
+                        break;
+                    case 'firefox':
+                        profileMatch = /Firefox/.test(ua);
+                }
+                if (profileMatch) {
+                    return true;
+                }
+            }
+            return false;
+        };
+
+        for (i = 0,ln = styleSheets.length; i < ln; i++) {
+            path = styleSheets[i];
+
+            if (typeof path != 'string') {
+                platform = path.platform;
+                exclude = path.exclude;
+                theme = path.theme;
+                path = path.path;
+            }
+
+            if (platform) {
+                if (!filterPlatform(platform) || filterPlatform(exclude)) {
+                    continue;
+                }
+                Ext.theme = {
+                    name: theme || 'Default'
+                };
+            }
+            write('<link rel="stylesheet" href="'+path+'">');
+        }
+
+        for (i = 0,ln = scripts.length; i < ln; i++) {
+            path = scripts[i];
+
+            if (typeof path != 'string') {
+                platform = path.platform;
+                exclude = path.exclude;
+                path = path.path;
+            }
+
+            if (platform) {
+                if (!filterPlatform(platform) || filterPlatform(exclude)) {
+                    continue;
+                }
+            }
+
+            write('<script src="'+path+'"></'+'script>');
+        }
+    }
+
+})(this);

vendor/touch/resources/sass/android.scss

@@ -1,39 +0,0 @@
-// Let's start with the basics
-$base-color: #333;
-$active-color: #ff8100;
-$base-gradient: 'flat';
-
-// Buttons
-$button-gradient: 'bevel';
-
-// Lists
-$list-bg-color: #eee;
-$list-color: #333;
-$list-pressed-color: #ddd;
-$list-active-gradient: 'recessed';
-$list-header-bg-color: #999;
-$list-header-gradient: 'bevel';
-
-// Tabs
-$tabs_dark_color: #000;
-
-@import 'sencha-touch/default/all';
-
-@include sencha-panel;
-@include sencha-buttons;
-@include sencha-sheet;
-@include sencha-picker;
-@include sencha-tabs;
-@include sencha-toolbar;
-@include sencha-toolbar-forms;
-@include sencha-carousel;
-@include sencha-indexbar;
-@include sencha-list;
-@include sencha-list-paging;
-@include sencha-list-pullrefresh;
-@include sencha-layout;
-@include sencha-form;
-@include sencha-msgbox;
-@include sencha-loading-spinner;
-@include sencha-draw;
-@include sencha-charts;

vendor/touch/resources/sass/apple.scss

@@ -1,41 +0,0 @@
-// Let's start with the basics
-$base-color: #7c92ae;
-$base-gradient: 'glossy';
-
-// Lists
-$list-active-gradient: 'bevel';
-$list-header-bg-color: transparentize(saturate($base-color, 10%), .25);
-$list-header-gradient: 'matte';
-
-// Tabs
-$tabs-dark: #111;
-
-@import 'sencha-touch/default/all';
-
-@include sencha-panel;
-@include sencha-buttons;
-@include sencha-sheet;
-@include sencha-picker;
-@include sencha-tabs;
-@include sencha-toolbar;
-@include sencha-toolbar-forms;
-@include sencha-carousel;
-@include sencha-indexbar;
-@include sencha-list;
-@include sencha-list-paging;
-@include sencha-list-pullrefresh;
-@include sencha-layout;
-@include sencha-form;
-@include sencha-msgbox;
-@include sencha-loading-spinner;
-@include sencha-draw;
-@include sencha-charts;
-
-.x-toolbar-light .x-title {
-    color: #fff;
-    text-shadow: rgba(0, 0, 0, 0.5) 0 -0.08em 0;
-}
-
-.x-button-back .x-button-label {
-    color: #fff;
-}

vendor/touch/resources/sass/base.scss

@@ -0,0 +1,3 @@
+@import 'sencha-touch/base';
+
+@include icon-font('Pictos', inline-font-files('pictos/pictos-web.woff', woff, 'pictos/pictos-web.ttf', truetype,'pictos/pictos-web.svg', svg));

vendor/touch/resources/sass/bb10.scss

@@ -0,0 +1,2 @@
+@import 'sencha-touch/bb10';
+@import 'sencha-touch/bb10/all';

vendor/touch/resources/sass/bb103.scss

@@ -0,0 +1,2 @@
+@import 'sencha-touch/bb103';
+@import 'sencha-touch/bb103/all';

vendor/touch/resources/sass/bb6.scss

@@ -1,68 +0,0 @@
-$include-highlights: false;
-$include-border-radius: false;
-
-// Let's start with the basics
-$base-color:  #393F45;
-$active-color:  #06f;
-$base-gradient: 'none';
-
-// Lists
-$list_pressed_color: #09f;
-$list_bg_color: #111;
-$list_color: #eee;
-$list_header_bg_color: #aaa;
-$basic-slider: true;
-
-@import 'sencha-touch/default/all';
-
-@include sencha-panel;
-@include sencha-buttons;
-@include sencha-sheet;
-@include sencha-picker;
-@include sencha-tabs;
-@include sencha-toolbar;
-@include sencha-toolbar-forms;
-@include sencha-carousel;
-@include sencha-indexbar;
-@include sencha-list;
-@include sencha-list-paging;
-@include sencha-list-pullrefresh;
-@include sencha-layout;
-@include sencha-form;
-@include sencha-msgbox;
-@include sencha-loading-spinner;
-@include sencha-draw;
-@include sencha-charts;
-
-.x-indexbar-item {
-    color: #FFF;
-}
-
-.x-scrollbar-dark {
-  background-color: rgba(255, 255, 255, .6);
-  border: 1px solid rgba(0, 0, 0, 0.2);
-}
-
-//fixing back/forward buttons in BB.
-$shadow-width: .065em; // Space between tip and its shadow
-$overlap-width: .2em; // how far the mask is clipped
-
-$mask-height: $button-height;
-$mask-width: $mask-height/2.5;
-$mask-offset: $button-radius - $overlap-width - $button-stroke-weight + $shadow-width - .22em;
-
-.x-button-forward, .x-button-back {
-    &:before, &:after {
-        @include insertion($mask-width, $mask-height, -$button-stroke-weight, auto);
-        z-index: 2;
-        -webkit-mask: $mask-offset 0 theme_image($theme-name, "tip_left.png") no-repeat;
-        -webkit-mask-size: $mask-width $mask-height;
-        overflow: hidden;
-    }
-}
-
-.x-button-forward, .x-toolbar .x-button-forward {
-    &:before, &:after {
-        -webkit-mask: -$mask-offset 0 theme_image($theme-name, "tip_right.png") no-repeat;
-    }
-  }

vendor/touch/resources/sass/config-debug.rb

@@ -7,5 +7,6 @@ load File.join(dir, '..', 'themes')
 # Compass configurations
 sass_path    = dir
 css_path     = File.join(dir, "..", "css-debug")
+fonts_path   = File.join(dir, '..', 'themes/fonts/')
 environment  = :development
 output_style = :expanded

vendor/touch/resources/sass/config.rb

@@ -5,7 +5,8 @@ dir = File.dirname(__FILE__)
 load File.join(dir, '..', 'themes')
 
 # Compass configurations
+fonts_path = File.join(dir, '..', 'themes/fonts/')
 sass_path = dir
 css_path = File.join(dir, "..", "css")
-environment  = :production
+environment  = :development
 output_style = :compressed