From 1058d48f460e5cd2edbd42a1b442836af88281e7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 21 Oct 2016 16:47:46 +0300 Subject: [PATCH 01/36] Add parameters to config for hiding toolbar, left menu, right menu. --- apps/api/documents/api.js | 5 ++++- apps/documenteditor/main/app/controller/Main.js | 5 ++++- apps/documenteditor/main/app/view/LeftMenu.js | 2 +- apps/presentationeditor/main/app/controller/Main.js | 5 ++++- apps/presentationeditor/main/app/view/LeftMenu.js | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 5 ++++- apps/spreadsheeteditor/main/app/view/LeftMenu.js | 2 +- 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index c05990e5a..fd4894e55 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -105,7 +105,10 @@ text: 'Go to London' }, chat: false, - comments: false + comments: false, + leftMenu: true, + rightMenu: true, + toolbar: true }, plugins: { url: '../../../../sdkjs-plugins/', diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index c591b3b68..bb29b3882 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -61,7 +61,10 @@ define([ var mapCustomizationElements = { about: 'button#left-btn-about', feedback: 'button#left-btn-support', - goback: '#fm-btn-back > a, #header-back > div' + goback: '#fm-btn-back > a, #header-back > div', + toolbar: '#viewport #toolbar', + leftMenu: '#viewport #left-menu', + rightMenu: '#viewport #right-menu' }; Common.localStorage.setId('text'); diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js index 8b9679064..aaeefbbc4 100644 --- a/apps/documenteditor/main/app/view/LeftMenu.js +++ b/apps/documenteditor/main/app/view/LeftMenu.js @@ -309,7 +309,7 @@ define([ showMenu: function(menu, opts) { var re = /^(\w+):?(\w*)$/.exec(menu); - if (re[1] == 'file') { + if (re[1] == 'file' && this.btnFile.isVisible() ) { if (!this.btnFile.pressed) { this.btnFile.toggle(true); // this.onBtnMenuClick(this.btnFile); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 81fc7760b..5a573bd0e 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -59,7 +59,10 @@ define([ var mapCustomizationElements = { about: 'button#left-btn-about', feedback: 'button#left-btn-support', - goback: '#fm-btn-back > a, #header-back > div' + goback: '#fm-btn-back > a, #header-back > div', + toolbar: '#viewport #toolbar', + leftMenu: '#viewport #left-menu', + rightMenu: '#viewport #right-menu' }; Common.localStorage.setId('presentation'); diff --git a/apps/presentationeditor/main/app/view/LeftMenu.js b/apps/presentationeditor/main/app/view/LeftMenu.js index 2d246bb06..a3d0624d0 100644 --- a/apps/presentationeditor/main/app/view/LeftMenu.js +++ b/apps/presentationeditor/main/app/view/LeftMenu.js @@ -330,7 +330,7 @@ define([ showMenu: function(menu) { var re = /^(\w+):?(\w*)$/.exec(menu); - if (re[1] == 'file') { + if (re[1] == 'file' && this.btnFile.isVisible()) { if (!this.btnFile.pressed) { this.btnFile.toggle(true); // this.onBtnMenuClick(this.btnFile); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index f8550ddb8..f5fbf3567 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -65,7 +65,10 @@ define([ var mapCustomizationElements = { about: 'button#left-btn-about', feedback: 'button#left-btn-support', - goback: '#fm-btn-back > a, #header-back > div' + goback: '#fm-btn-back > a, #header-back > div', + toolbar: '#viewport #toolbar', + leftMenu: '#viewport #left-menu', + rightMenu: '#viewport #right-menu' }; Common.localStorage.setId('table'); diff --git a/apps/spreadsheeteditor/main/app/view/LeftMenu.js b/apps/spreadsheeteditor/main/app/view/LeftMenu.js index 6e63ce136..4eb41ca9b 100644 --- a/apps/spreadsheeteditor/main/app/view/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/view/LeftMenu.js @@ -294,7 +294,7 @@ define([ showMenu: function(menu) { var re = /^(\w+):?(\w*)$/.exec(menu); - if (re[1] == 'file') { + if (re[1] == 'file' && this.btnFile.isVisible()) { if (!this.btnFile.pressed) { this.btnFile.toggle(true); this.btnFile.$el.focus(); From 04acc3ecc8657fbc581f88dbb7e7dac260d8f1e9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 21 Oct 2016 17:09:58 +0300 Subject: [PATCH 02/36] Autostart plugin after loading plugins. --- apps/api/documents/api.js | 60 +++---------------- apps/common/main/lib/controller/Plugins.js | 3 +- apps/common/main/lib/view/Plugins.js | 5 ++ .../main/app/controller/Main.js | 6 +- .../main/app/controller/Main.js | 6 +- .../main/app/controller/Main.js | 6 +- 6 files changed, 29 insertions(+), 57 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index fd4894e55..38554517a 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -111,60 +111,14 @@ toolbar: true }, plugins: { + autoStartGuid: 'asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}', url: '../../../../sdkjs-plugins/', - pluginsData: [{ - name : "chess (fen)", - guid : "asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}", - baseUrl: "", - variations : [ - { - description : "chess", - url : "chess/index.html", - - icons : ["chess/icon.png", "chess/icon@2x.png"], - isViewer : true, - EditorsSupport : ["word", "cell", "slide"], - - isVisual : true, - isModal : true, - isInsideMode : false, - - initDataType : "ole", - initData : "", - - isUpdateOleOnResize : true, - - buttons : [ { text: "Ok", primary: true }, - { text: "Cancel", primary: false } ] - } - ] - }, - { - name : "glavred", - guid : "asc.{B631E142-E40B-4B4C-90B9-2D00222A286E}", - baseUrl: "", - variations : [ - { - description : "glavred", - url : "glavred/index.html", - - icons : ["glavred/icon.png", "glavred/icon@2x.png"], - isViewer : true, - EditorsSupport : ["word", "cell", "slide"], - - isVisual : true, - isModal : true, - isInsideMode : false, - - initDataType : "text", - initData : "", - - isUpdateOleOnResize : false, - - buttons : [ { text: "Ok", primary: true } ] - } - ] - } + pluginsData: [ + "helloworld/config.json", + "chess/config.json", + "speech/config.json", + "clipart/config.json", + ] } }, events: { diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index cc111a1fb..3ba2ad6fa 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -224,7 +224,8 @@ define([ url = ((plugin.get_BaseUrl().length == 0) ? this.panelPlugins.pluginsPath : plugin.get_BaseUrl()) + url; if (variation.get_InsideMode()) { - this.panelPlugins.openInsideMode(plugin.get_Name(), url); + if (!this.panelPlugins.openInsideMode(plugin.get_Name(), url)) + this.api.asc_pluginButtonClick(-1); } else { var me = this, arrBtns = variation.get_Buttons(), diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index e68c5104b..acba2de06 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -138,6 +138,8 @@ define([ }, openInsideMode: function(name, url) { + if (!this.pluginsPanel) return false; + this.pluginsPanel.toggleClass('hidden', true); this.currentPluginPanel.toggleClass('hidden', false); @@ -161,9 +163,12 @@ define([ this.iframePlugin.src = url; } + return true; }, closeInsideMode: function() { + if (!this.pluginsPanel) return; + if (this.iframePlugin) { this.currentPluginFrame.empty(); this.iframePlugin = null; diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index bb29b3882..371d90fff 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1771,6 +1771,7 @@ define([ if (arr.length>0) this.updatePluginsList({ + autoStartGuid: plugins.autoStartGuid, url: plugins.url, pluginsData: arr }); @@ -1829,8 +1830,11 @@ define([ this.appOptions.pluginsPath = ''; this.appOptions.canPlugins = false; } - if (this.appOptions.canPlugins) + if (this.appOptions.canPlugins) { this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions); + if (plugins.autoStartGuid) + this.api.asc_pluginRun(plugins.autoStartGuid, 0, ''); + } this.getApplication().getController('LeftMenu').enablePlugins(); }, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 5a573bd0e..d199878aa 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1545,6 +1545,7 @@ define([ if (arr.length>0) this.updatePluginsList({ + autoStartGuid: plugins.autoStartGuid, url: plugins.url, pluginsData: arr }); @@ -1603,8 +1604,11 @@ define([ this.appOptions.pluginsPath = ''; this.appOptions.canPlugins = false; } - if (this.appOptions.canPlugins) + if (this.appOptions.canPlugins) { this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions); + if (plugins.autoStartGuid) + this.api.asc_pluginRun(plugins.autoStartGuid, 0, ''); + } this.getApplication().getController('LeftMenu').enablePlugins(); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index f5fbf3567..4d1b9f8dc 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1777,6 +1777,7 @@ define([ if (arr.length>0) this.updatePluginsList({ + autoStartGuid: plugins.autoStartGuid, url: plugins.url, pluginsData: arr }); @@ -1835,8 +1836,11 @@ define([ this.appOptions.pluginsPath = ''; this.appOptions.canPlugins = false; } - if (this.appOptions.canPlugins) + if (this.appOptions.canPlugins) { this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions); + if (plugins.autoStartGuid) + this.api.asc_pluginRun(plugins.autoStartGuid, 0, ''); + } this.getApplication().getController('LeftMenu').enablePlugins(); }, From 1824834c01c6dc276281a228aeb1bc830b3e05e1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 25 Oct 2016 16:22:22 +0300 Subject: [PATCH 03/36] [SSE] Add "Select from drop-down list" item to cell context menu. --- .../main/app/controller/DocumentHolder.js | 13 ++++++++++++- .../main/app/view/DocumentHolder.js | 9 +++++++-- apps/spreadsheeteditor/main/locale/en.json | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 2735950b0..fb964e18f 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -169,6 +169,7 @@ define([ view.pmiEntireHide.on('click', _.bind(me.onEntireHide, me)); view.pmiEntireShow.on('click', _.bind(me.onEntireShow, me)); view.pmiFreezePanes.on('click', _.bind(me.onFreezePanes, me)); + view.pmiEntriesList.on('click', _.bind(me.onEntriesList, me)); /** coauthoring begin **/ view.pmiAddComment.on('click', _.bind(me.onAddComment, me)); /** coauthoring end **/ @@ -249,7 +250,7 @@ define([ this.api.asc_registerCallback('asc_onEditCell', _.bind(this.onApiEditCell, this)); this.api.asc_registerCallback('asc_onLockDefNameManager', _.bind(this.onLockDefNameManager, this)); this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onSelectionChanged, this)); - this.api.asc_registerCallback('asc_onEntriesListMenu', _.bind(this.onEntriesListMenu, this)); + this.api.asc_registerCallback('asc_onEntriesListMenu', _.bind(this.onEntriesListMenu, this)); // Alt + Down this.api.asc_registerCallback('asc_onFormulaCompleteMenu', _.bind(this.onFormulaCompleteMenu, this)); return this; @@ -517,6 +518,15 @@ define([ this.api.asc_freezePane(); }, + onEntriesList: function(item) { + if (this.api) { + var me = this; + setTimeout(function() { + me.api.asc_showAutoComplete(); + }, 10); + } + }, + onAddComment: function(item) { if (this.api && this.permissions.canCoAuthoring && this.permissions.isEdit && this.permissions.canComments) { @@ -1296,6 +1306,7 @@ define([ documentHolder.pmiEntireShow.setVisible(iscolmenu||isrowmenu); documentHolder.pmiFreezePanes.setVisible(!iscelledit); documentHolder.pmiFreezePanes.setCaption(this.api.asc_getSheetViewSettings().asc_getIsFreezePane() ? documentHolder.textUnFreezePanes : documentHolder.textFreezePanes); + documentHolder.pmiEntriesList.setVisible(!iscelledit); /** coauthoring begin **/ documentHolder.ssMenu.items[16].setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments); diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index c2df2c638..8d2efff01 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -345,6 +345,10 @@ define([ caption : me.textFreezePanes }); + me.pmiEntriesList = new Common.UI.MenuItem({ + caption : me.textEntriesList + }); + me.ssMenu = new Common.UI.Menu({ id : 'id-context-menu-cell', items : [ @@ -367,6 +371,7 @@ define([ {caption: '--'}, me.pmiAddComment, me.pmiCellMenuSeparator, + me.pmiEntriesList, me.pmiAddNamedRange, me.pmiInsFunction, me.menuAddHyperlink, @@ -578,7 +583,6 @@ define([ cyclic: false, items: [] }).on('render:after', function(mnu) { - mnu.cmpEl.removeAttr('oo_editor_input').attr('oo_editor_keyboard', true); this.scroller = new Common.UI.Scroller({ el: $(this.el).find('.dropdown-menu '), useKeyboard: this.enableKeyEvents && !this.handleSelect, @@ -686,7 +690,8 @@ define([ txtAutoColumnWidth: 'Auto Fit Column Width', txtAutoRowHeight: 'Auto Fit Row Height', txtCustomColumnWidth: 'Custom Column Width', - txtCustomRowHeight: 'Custom Row Height' + txtCustomRowHeight: 'Custom Row Height', + textEntriesList: 'Select from drop-down list' }, SSE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 9304abbe5..e4fdef9b4 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -926,6 +926,7 @@ "SSE.Views.DocumentHolder.txtUngroup": "Ungroup", "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "SSE.Views.DocumentHolder.textEntriesList": "Select from drop-down list", "SSE.Views.FileMenu.btnBackCaption": "Go to Documents", "SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu", "SSE.Views.FileMenu.btnCreateNewCaption": "Create New", From af438ff5f2c7b57241b42f387944d88e29c5c23c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 25 Oct 2016 16:46:21 +0300 Subject: [PATCH 04/36] Update translations. --- apps/common/main/lib/view/History.js | 1 - apps/documenteditor/main/locale/en.json | 6 +-- apps/documenteditor/main/locale/fr.json | 51 +++++++++++++-------- apps/documenteditor/main/locale/ru.json | 28 +++++++++-- apps/presentationeditor/main/locale/ru.json | 23 +++++++++- apps/spreadsheeteditor/main/locale/en.json | 2 +- apps/spreadsheeteditor/main/locale/ru.json | 29 ++++++++++-- 7 files changed, 107 insertions(+), 33 deletions(-) diff --git a/apps/common/main/lib/view/History.js b/apps/common/main/lib/view/History.js index 40ffc52d1..fd1fceb76 100644 --- a/apps/common/main/lib/view/History.js +++ b/apps/common/main/lib/view/History.js @@ -145,7 +145,6 @@ define([ return this; }, - textHistoryHeader: 'Back to Document', textRestore: 'Restore', textShow: 'Expand', textHide: 'Collapse', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 23c72830c..3a90fbc45 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -144,11 +144,10 @@ "Common.Views.Header.txtHeaderDeveloper": "DEVELOPER MODE", "Common.Views.Header.txtRename": "Rename", "Common.Views.History.textCloseHistory": "Close History", - "del_Common.Views.History.textHistoryHeader": "Back to Document", - "Common.Views.History.textRestore": "Restore", - "Common.Views.History.textShow": "Expand", "Common.Views.History.textHide": "Collapse", "Common.Views.History.textHideAll": "Hide detailed changes", + "Common.Views.History.textRestore": "Restore", + "Common.Views.History.textShow": "Expand", "Common.Views.History.textShowAll": "Show detailed changes", "Common.Views.ImageFromUrlDialog.cancelButtonText": "Cancel", "Common.Views.ImageFromUrlDialog.okButtonText": "OK", @@ -197,7 +196,6 @@ "DE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
Are you sure you want to continue?", "DE.Controllers.Main.applyChangesTextText": "Loading the changes...", "DE.Controllers.Main.applyChangesTitleText": "Loading the Changes", - "del_DE.Controllers.Main.convertationErrorText": "Conversion failed.", "DE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.", "DE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.", "DE.Controllers.Main.criticalErrorTitle": "Error", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 3533035f1..9944f0188 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -141,7 +141,14 @@ "Common.Views.ExternalMergeEditor.textTitle": "Destinataires de fusion et publipostage", "Common.Views.Header.openNewTabText": "Ouvrir dans un nouvel onglet", "Common.Views.Header.textBack": "Aller aux Documents", - "Common.Views.History.textHistoryHeader": "Retour au Document", + "Common.Views.Header.txtHeaderDeveloper": "MODE DEVELOPPEUR", + "Common.Views.Header.txtRename": "Renommer", + "Common.Views.History.textCloseHistory": "Fermer l'historique", + "Common.Views.History.textHide": "Réduire", + "Common.Views.History.textHideAll": "Hide detailed changes", + "Common.Views.History.textRestore": "Restaurer", + "Common.Views.History.textShow": "Développer", + "Common.Views.History.textShowAll": "Afficher les modifications détaillées", "Common.Views.ImageFromUrlDialog.cancelButtonText": "Annuler", "Common.Views.ImageFromUrlDialog.okButtonText": "OK", "Common.Views.ImageFromUrlDialog.textUrl": "Coller URL d'image", @@ -158,13 +165,17 @@ "Common.Views.OpenDialog.cancelButtonText": "Annuler", "Common.Views.OpenDialog.okButtonText": "OK", "Common.Views.OpenDialog.txtEncoding": "Codage ", - "Common.Views.OpenDialog.txtPassword": "Password", + "Common.Views.OpenDialog.txtPassword": "Mot de passe", "Common.Views.OpenDialog.txtTitle": "Choisir %1 des options ", - "Common.Views.OpenDialog.txtTitleProtected": "Protected File", - "Common.Views.PluginDlg.textLoading": "Loading", + "Common.Views.OpenDialog.txtTitleProtected": "Fichier protégé", + "Common.Views.PluginDlg.textLoading": "Chargement", "Common.Views.Plugins.strPlugins": "Plugins", - "Common.Views.Plugins.textLoading": "Loading", - "Common.Views.Plugins.textStart": "Start", + "Common.Views.Plugins.textLoading": "Chargement", + "Common.Views.Plugins.textStart": "Démarrer", + "Common.Views.RenameDialog.cancelButtonText": "Annuler", + "Common.Views.RenameDialog.okButtonText": "Ok", + "Common.Views.RenameDialog.textName": "Nom de fichier", + "Common.Views.RenameDialog.txtInvalidName": "Un nom de fichier ne peut pas contenir les caractères suivants :", "Common.Views.ReviewChanges.txtAccept": "Accepter", "Common.Views.ReviewChanges.txtAcceptAll": "Accepter toutes les modifications", "Common.Views.ReviewChanges.txtAcceptCurrent": "Accepter la modification actuelle", @@ -185,7 +196,6 @@ "DE.Controllers.LeftMenu.warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.
Êtes-vous sûr de vouloir continuer ?", "DE.Controllers.Main.applyChangesTextText": "Chargement des changemets...", "DE.Controllers.Main.applyChangesTitleText": "Chargement des changemets", - "DE.Controllers.Main.convertationErrorText": "Échec de la conversion.", "DE.Controllers.Main.convertationTimeoutText": "Expiration du délai de conversion.", "DE.Controllers.Main.criticalErrorExtText": "Cliquez sur \"OK\" pour revenir à la liste des documents.", "DE.Controllers.Main.criticalErrorTitle": "Erreur", @@ -225,7 +235,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.openErrorText": "Une erreur s’est produite lors de l’ouverture du fichier", "DE.Controllers.Main.openTextText": "Ouverture du document...", "DE.Controllers.Main.openTitleText": "Ouverture du document", "DE.Controllers.Main.printTextText": "Impression d'un document...", @@ -233,7 +243,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.saveErrorText": "Une erreur s'est produite lors de l'enregistrement du fichier", "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...", @@ -244,14 +254,14 @@ "DE.Controllers.Main.splitMaxColsErrorText": "Le nombre de colonnes doivent être inférieure à %1.", "DE.Controllers.Main.splitMaxRowsErrorText": "Le nombre de lignes doit être inférieure à %1.", "DE.Controllers.Main.textAnonymous": "Anonyme", - "DE.Controllers.Main.textBuyNow": "Visit website", + "DE.Controllers.Main.textBuyNow": "Visiter le site web", "DE.Controllers.Main.textCloseTip": "Cliquez pour fermer le conseil", - "DE.Controllers.Main.textContactUs": "Contact sales", + "DE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes", "DE.Controllers.Main.textLoadingDocument": "Chargement du document", - "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version", + "DE.Controllers.Main.textNoLicenseTitle": "La version open source de ONLYOFFICE", "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.
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.titleLicenseExp": "Licence expirée", "DE.Controllers.Main.titleUpdateVersion": "Version a été modifiée", "DE.Controllers.Main.txtArt": "Votre texte ici", "DE.Controllers.Main.txtBasicShapes": "Formes de base", @@ -279,7 +289,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.
Please update your license and refresh the page.", + "DE.Controllers.Main.warnLicenseExp": "Votre licence a expiré.
Veuillez mettre à jour votre licence et actualisez la 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).
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", @@ -859,6 +869,7 @@ "DE.Views.DropcapSettingsAdvanced.tipFontName": "Nom de la police", "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Pas de bordures", "DE.Views.FileMenu.btnBackCaption": "Aller aux Documents", + "DE.Views.FileMenu.btnCloseMenuCaption": "Fermer le menu", "DE.Views.FileMenu.btnCreateNewCaption": "Créer un nouveau", "DE.Views.FileMenu.btnDownloadCaption": "Télécharger comme...", "DE.Views.FileMenu.btnHelpCaption": "Aide...", @@ -866,6 +877,7 @@ "DE.Views.FileMenu.btnInfoCaption": "Descriptif du document...", "DE.Views.FileMenu.btnPrintCaption": "Imprimer", "DE.Views.FileMenu.btnRecentFilesCaption": "Ouvrir récent...", + "DE.Views.FileMenu.btnRenameCaption": "Renommer...", "DE.Views.FileMenu.btnReturnCaption": "Retour au Document", "DE.Views.FileMenu.btnRightsCaption": "Droits d'accès...", "DE.Views.FileMenu.btnSaveAsCaption": "Enregistrer sous", @@ -920,8 +932,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.txtFitPage": "Ajuster à la page", + "DE.Views.FileMenuPanels.Settings.txtFitWidth": "Ajuster à la largeur", "DE.Views.FileMenuPanels.Settings.txtInch": "Pouce", "DE.Views.FileMenuPanels.Settings.txtInput": "Entrée alternative", "DE.Views.FileMenuPanels.Settings.txtLast": "Voir le dernier", @@ -956,8 +968,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.textEdit": "Modifier", + "DE.Views.ImageSettings.textEditObject": "Modifier l'objet", "DE.Views.ImageSettings.textFromFile": "Depuis un fichier", "DE.Views.ImageSettings.textFromUrl": "D'une URL", "DE.Views.ImageSettings.textHeight": "Hauteur", @@ -1433,6 +1445,7 @@ "DE.Views.Toolbar.textHideTitleBar": "Masquer la barre de titres", "DE.Views.Toolbar.textInMargin": "Dans la Marge", "DE.Views.Toolbar.textInsColumnBreak": "Insérer une écart de colonne", + "DE.Views.Toolbar.textInsertPageCount": "Insérer le nombre de pages", "DE.Views.Toolbar.textInsertPageNumber": "Insérer le numéro de page", "DE.Views.Toolbar.textInsPageBreak": "Insérer un saut de page", "DE.Views.Toolbar.textInsSectionBreak": "Insérer un saut de section", @@ -1440,7 +1453,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.textLandscape": "Paysage", "DE.Views.Toolbar.textLeft": "À gauche:", "DE.Views.Toolbar.textLine": "Graphique en ligne", "DE.Views.Toolbar.textMarginsLast": "Dernière mesure", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 49c67478d..141b497fd 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -141,7 +141,14 @@ "Common.Views.ExternalMergeEditor.textTitle": "Получатели слияния", "Common.Views.Header.openNewTabText": "Открыть в новой вкладке", "Common.Views.Header.textBack": "Перейти к Документам", - "Common.Views.History.textHistoryHeader": "Вернуться к документу", + "Common.Views.Header.txtHeaderDeveloper": "РЕЖИМ РАЗРАБОТЧИКА", + "Common.Views.Header.txtRename": "Переименовать", + "Common.Views.History.textCloseHistory": "Закрыть историю", + "Common.Views.History.textHide": "Свернуть", + "Common.Views.History.textHideAll": "Скрыть подробные изменения", + "Common.Views.History.textRestore": "Восстановить", + "Common.Views.History.textShow": "Развернуть", + "Common.Views.History.textShowAll": "Показать подробные изменения", "Common.Views.ImageFromUrlDialog.cancelButtonText": "Отмена", "Common.Views.ImageFromUrlDialog.okButtonText": "OK", "Common.Views.ImageFromUrlDialog.textUrl": "Вставьте URL изображения:", @@ -158,10 +165,17 @@ "Common.Views.OpenDialog.cancelButtonText": "Отмена", "Common.Views.OpenDialog.okButtonText": "OK", "Common.Views.OpenDialog.txtEncoding": "Кодировка", + "Common.Views.OpenDialog.txtPassword": "Пароль", "Common.Views.OpenDialog.txtTitle": "Выбрать параметры %1", + "Common.Views.OpenDialog.txtTitleProtected": "Защищенный файл", + "Common.Views.PluginDlg.textLoading": "Загрузка", "Common.Views.Plugins.strPlugins": "Дополнения", "Common.Views.Plugins.textLoading": "Загрузка", "Common.Views.Plugins.textStart": "Запустить", + "Common.Views.RenameDialog.cancelButtonText": "Отмена", + "Common.Views.RenameDialog.okButtonText": "Ok", + "Common.Views.RenameDialog.textName": "Имя файла", + "Common.Views.RenameDialog.txtInvalidName": "Имя файла не должно содержать следующих символов: ", "Common.Views.ReviewChanges.txtAccept": "Принять", "Common.Views.ReviewChanges.txtAcceptAll": "Принять все изменения", "Common.Views.ReviewChanges.txtAcceptCurrent": "Принять текущее изменение", @@ -182,7 +196,6 @@ "DE.Controllers.LeftMenu.warnDownloadAs": "Если Вы продолжите сохранение в этот формат, весь функционал, кроме текста, будет потерян.
Вы действительно хотите продолжить?", "DE.Controllers.Main.applyChangesTextText": "Загрузка изменений...", "DE.Controllers.Main.applyChangesTitleText": "Загрузка изменений", - "DE.Controllers.Main.convertationErrorText": "Конвертация не удалась.", "DE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.", "DE.Controllers.Main.criticalErrorExtText": "Нажмите \"OK\", чтобы вернуться к списку документов.", "DE.Controllers.Main.criticalErrorTitle": "Ошибка", @@ -207,7 +220,7 @@ "DE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", "DE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "DE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", - "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать его до восстановления подключения.", + "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать или напечатать его до восстановления подключения.", "DE.Controllers.Main.leavePageText": "Документ содержит несохраненные изменения. Чтобы сохранить их, нажмите \"Остаться на этой странице\", затем \"Сохранить\". Нажмите \"Покинуть эту страницу\", чтобы сбросить все несохраненные изменения.", "DE.Controllers.Main.loadFontsTextText": "Загрузка данных...", "DE.Controllers.Main.loadFontsTitleText": "Загрузка данных", @@ -222,6 +235,7 @@ "DE.Controllers.Main.mailMergeLoadFileText": "Загрузка источника данных...", "DE.Controllers.Main.mailMergeLoadFileTitle": "Загрузка источника данных", "DE.Controllers.Main.notcriticalErrorTitle": "Предупреждение", + "DE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка", "DE.Controllers.Main.openTextText": "Открытие документа...", "DE.Controllers.Main.openTitleText": "Открытие документа", "DE.Controllers.Main.printTextText": "Печать документа...", @@ -229,6 +243,7 @@ "DE.Controllers.Main.reloadButtonText": "Обновить страницу", "DE.Controllers.Main.requestEditFailedMessageText": "В настоящее время документ редактируется. Пожалуйста, попробуйте позже.", "DE.Controllers.Main.requestEditFailedTitleText": "Доступ запрещён", + "DE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка", "DE.Controllers.Main.savePreparingText": "Подготовка к сохранению", "DE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "DE.Controllers.Main.saveTextText": "Сохранение документа...", @@ -246,6 +261,7 @@ "DE.Controllers.Main.textNoLicenseTitle": "Open source версия ONLYOFFICE", "DE.Controllers.Main.textStrict": "Строгий режим", "DE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.
Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.", + "DE.Controllers.Main.titleLicenseExp": "Истек срок действия лицензии", "DE.Controllers.Main.titleUpdateVersion": "Версия изменилась", "DE.Controllers.Main.txtArt": "Введите ваш текст", "DE.Controllers.Main.txtBasicShapes": "Основные фигуры", @@ -273,6 +289,7 @@ "DE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", "DE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.", "DE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0.", + "DE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
Обновите лицензию, а затем обновите страницу.", "DE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения", @@ -852,6 +869,7 @@ "DE.Views.DropcapSettingsAdvanced.tipFontName": "Название шрифта", "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Без границ", "DE.Views.FileMenu.btnBackCaption": "Перейти к Документам", + "DE.Views.FileMenu.btnCloseMenuCaption": "Закрыть меню", "DE.Views.FileMenu.btnCreateNewCaption": "Создать новый", "DE.Views.FileMenu.btnDownloadCaption": "Скачать как...", "DE.Views.FileMenu.btnHelpCaption": "Справка...", @@ -859,6 +877,7 @@ "DE.Views.FileMenu.btnInfoCaption": "Сведения о документе...", "DE.Views.FileMenu.btnPrintCaption": "Печать", "DE.Views.FileMenu.btnRecentFilesCaption": "Открыть последние...", + "DE.Views.FileMenu.btnRenameCaption": "Переименовать...", "DE.Views.FileMenu.btnReturnCaption": "Вернуться к документу", "DE.Views.FileMenu.btnRightsCaption": "Права доступа...", "DE.Views.FileMenu.btnSaveAsCaption": "Сохранить как", @@ -913,6 +932,8 @@ "DE.Views.FileMenuPanels.Settings.textMinute": "Каждую минуту", "DE.Views.FileMenuPanels.Settings.txtAll": "Все", "DE.Views.FileMenuPanels.Settings.txtCm": "Сантиметр", + "DE.Views.FileMenuPanels.Settings.txtFitPage": "По размеру страницы", + "DE.Views.FileMenuPanels.Settings.txtFitWidth": "По ширине", "DE.Views.FileMenuPanels.Settings.txtInch": "Дюйм", "DE.Views.FileMenuPanels.Settings.txtInput": "Альтернативный ввод", "DE.Views.FileMenuPanels.Settings.txtLast": "Последние", @@ -1424,6 +1445,7 @@ "DE.Views.Toolbar.textHideTitleBar": "Скрыть строку заголовка", "DE.Views.Toolbar.textInMargin": "На поле", "DE.Views.Toolbar.textInsColumnBreak": "Вставить разрыв колонки", + "DE.Views.Toolbar.textInsertPageCount": "Вставить число страниц", "DE.Views.Toolbar.textInsertPageNumber": "Вставить номер страницы", "DE.Views.Toolbar.textInsPageBreak": "Вставить разрыв страницы", "DE.Views.Toolbar.textInsSectionBreak": "Вставить разрыв раздела", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index a39dd8fcd..4ef5ce5a6 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -80,6 +80,8 @@ "Common.Views.ExternalDiagramEditor.textTitle": "Редактор диаграмм", "Common.Views.Header.openNewTabText": "Открыть в новой вкладке", "Common.Views.Header.textBack": "Перейти к Документам", + "Common.Views.Header.txtHeaderDeveloper": "РЕЖИМ РАЗРАБОТЧИКА", + "Common.Views.Header.txtRename": "Переименовать", "Common.Views.ImageFromUrlDialog.cancelButtonText": "Отмена", "Common.Views.ImageFromUrlDialog.okButtonText": "OK", "Common.Views.ImageFromUrlDialog.textUrl": "Вставьте URL изображения:", @@ -93,15 +95,25 @@ "Common.Views.InsertTableDialog.txtMinText": "Минимальное значение для этого поля - {0}.", "Common.Views.InsertTableDialog.txtRows": "Количество строк", "Common.Views.InsertTableDialog.txtTitle": "Размер таблицы", + "Common.Views.OpenDialog.cancelButtonText": "Отмена", + "Common.Views.OpenDialog.okButtonText": "OK", + "Common.Views.OpenDialog.txtEncoding": "Кодировка", + "Common.Views.OpenDialog.txtPassword": "Пароль", + "Common.Views.OpenDialog.txtTitle": "Выбрать параметры %1", + "Common.Views.OpenDialog.txtTitleProtected": "Защищенный файл", + "Common.Views.PluginDlg.textLoading": "Загрузка", "Common.Views.Plugins.strPlugins": "Дополнения", "Common.Views.Plugins.textLoading": "Загрузка", "Common.Views.Plugins.textStart": "Запустить", + "Common.Views.RenameDialog.cancelButtonText": "Отмена", + "Common.Views.RenameDialog.okButtonText": "Ok", + "Common.Views.RenameDialog.textName": "Имя файла", + "Common.Views.RenameDialog.txtInvalidName": "Имя файла не должно содержать следующих символов: ", "PE.Controllers.LeftMenu.newDocumentTitle": "Презентация без имени", "PE.Controllers.LeftMenu.requestEditRightsText": "Запрос прав на редактирование...", "PE.Controllers.LeftMenu.textNoTextFound": "Искомые данные не найдены. Пожалуйста, измените параметры поиска.", "PE.Controllers.Main.applyChangesTextText": "Загрузка данных...", "PE.Controllers.Main.applyChangesTitleText": "Загрузка данных", - "PE.Controllers.Main.convertationErrorText": "Конвертация не удалась.", "PE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.", "PE.Controllers.Main.criticalErrorExtText": "Нажмите \"OK\", чтобы вернуться к списку документов.", "PE.Controllers.Main.criticalErrorTitle": "Ошибка", @@ -122,7 +134,7 @@ "PE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", "PE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "PE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", - "PE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать его до восстановления подключения.", + "PE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать или напечатать его до восстановления подключения.", "PE.Controllers.Main.leavePageText": "Презентация содержит несохраненные изменения. Чтобы сохранить их, нажмите \"Остаться на этой странице\", затем \"Сохранить\". Нажмите \"Покинуть эту страницу\", чтобы сбросить все несохраненные изменения.", "PE.Controllers.Main.loadFontsTextText": "Загрузка данных...", "PE.Controllers.Main.loadFontsTitleText": "Загрузка данных", @@ -137,6 +149,7 @@ "PE.Controllers.Main.loadThemeTextText": "Загрузка темы...", "PE.Controllers.Main.loadThemeTitleText": "Загрузка темы", "PE.Controllers.Main.notcriticalErrorTitle": "Предупреждение", + "PE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка", "PE.Controllers.Main.openTextText": "Открытие презентации...", "PE.Controllers.Main.openTitleText": "Открытие презентации", "PE.Controllers.Main.printTextText": "Печать презентации...", @@ -144,6 +157,7 @@ "PE.Controllers.Main.reloadButtonText": "Обновить страницу", "PE.Controllers.Main.requestEditFailedMessageText": "В настоящее время презентация редактируется. Пожалуйста, повторите попытку позже.", "PE.Controllers.Main.requestEditFailedTitleText": "Доступ запрещён", + "PE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка", "PE.Controllers.Main.savePreparingText": "Подготовка к сохранению", "PE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "PE.Controllers.Main.saveTextText": "Сохранение презентации...", @@ -160,6 +174,7 @@ "PE.Controllers.Main.textShape": "Фигура", "PE.Controllers.Main.textStrict": "Строгий режим", "PE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.
Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.", + "PE.Controllers.Main.titleLicenseExp": "Истек срок действия лицензии", "PE.Controllers.Main.txtArt": "Введите ваш текст", "PE.Controllers.Main.txtBasicShapes": "Основные фигуры", "PE.Controllers.Main.txtButtons": "Кнопки", @@ -221,6 +236,7 @@ "PE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", "PE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.", "PE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0", + "PE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
Обновите лицензию, а затем обновите страницу.", "PE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "PE.Controllers.Statusbar.zoomText": "Масштаб {0}%", @@ -327,12 +343,14 @@ "PE.Views.DocumentPreview.txtPrev": "Предыдущий слайд", "PE.Views.FileMenu.btnAboutCaption": "О программе", "PE.Views.FileMenu.btnBackCaption": "Перейти к Документам", + "PE.Views.FileMenu.btnCloseMenuCaption": "Закрыть меню", "PE.Views.FileMenu.btnCreateNewCaption": "Создать новую", "PE.Views.FileMenu.btnDownloadCaption": "Скачать как...", "PE.Views.FileMenu.btnHelpCaption": "Справка...", "PE.Views.FileMenu.btnInfoCaption": "Сведения о презентации...", "PE.Views.FileMenu.btnPrintCaption": "Печать", "PE.Views.FileMenu.btnRecentFilesCaption": "Открыть последние...", + "PE.Views.FileMenu.btnRenameCaption": "Переименовать...", "PE.Views.FileMenu.btnReturnCaption": "Вернуться к презентации", "PE.Views.FileMenu.btnRightsCaption": "Права доступа...", "PE.Views.FileMenu.btnSaveAsCaption": "Сохранить как", @@ -377,6 +395,7 @@ "PE.Views.FileMenuPanels.Settings.txtAll": "Все", "PE.Views.FileMenuPanels.Settings.txtCm": "Сантиметр", "PE.Views.FileMenuPanels.Settings.txtFitSlide": "По размеру слайда", + "PE.Views.FileMenuPanels.Settings.txtFitWidth": "По ширине", "PE.Views.FileMenuPanels.Settings.txtInch": "Дюйм", "PE.Views.FileMenuPanels.Settings.txtInput": "Альтернативный ввод", "PE.Views.FileMenuPanels.Settings.txtLast": "Последние", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index e4fdef9b4..96b7ea7d7 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -795,7 +795,7 @@ "SSE.Views.ChartSettingsDlg.textOuterTop": "Outer Top", "SSE.Views.ChartSettingsDlg.textOverlay": "Overlay", "SSE.Views.ChartSettingsDlg.textPie": "Pie Chart", - "SSE.Views.ChartSettingsDlg.textPoint": "Point Chart", + "SSE.Views.ChartSettingsDlg.textPoint": "XY (Scatter) Chart", "SSE.Views.ChartSettingsDlg.textReverse": "Values in reverse order", "SSE.Views.ChartSettingsDlg.textRight": "Right", "SSE.Views.ChartSettingsDlg.textRightOverlay": "Right Overlay", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index c76b2c113..ae3dd4a91 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -74,6 +74,8 @@ "Common.Views.DocumentAccessDialog.textTitle": "Настройки совместного доступа", "Common.Views.Header.openNewTabText": "Открыть в новой вкладке", "Common.Views.Header.textBack": "Перейти к Документам", + "Common.Views.Header.txtHeaderDeveloper": "РЕЖИМ РАЗРАБОТЧИКА", + "Common.Views.Header.txtRename": "Переименовать", "Common.Views.ImageFromUrlDialog.cancelButtonText": "Отмена", "Common.Views.ImageFromUrlDialog.okButtonText": "OK", "Common.Views.ImageFromUrlDialog.textUrl": "Вставьте URL изображения:", @@ -83,12 +85,19 @@ "Common.Views.OpenDialog.okButtonText": "OK", "Common.Views.OpenDialog.txtDelimiter": "Разделитель", "Common.Views.OpenDialog.txtEncoding": "Кодировка ", + "Common.Views.OpenDialog.txtPassword": "Пароль", "Common.Views.OpenDialog.txtSpace": "Пробел", "Common.Views.OpenDialog.txtTab": "Табуляция", "Common.Views.OpenDialog.txtTitle": "Выбрать параметры %1", + "Common.Views.OpenDialog.txtTitleProtected": "Защищенный файл", + "Common.Views.PluginDlg.textLoading": "Загрузка", "Common.Views.Plugins.strPlugins": "Дополнения", "Common.Views.Plugins.textLoading": "Загрузка", "Common.Views.Plugins.textStart": "Запустить", + "Common.Views.RenameDialog.cancelButtonText": "Отмена", + "Common.Views.RenameDialog.okButtonText": "Ok", + "Common.Views.RenameDialog.textName": "Имя файла", + "Common.Views.RenameDialog.txtInvalidName": "Имя файла не должно содержать следующих символов: ", "SSE.Controllers.DocumentHolder.errorInvalidLink": "Ссылка указывает на несуществующую ячейку. Исправьте или удалите ссылку.", "SSE.Controllers.DocumentHolder.guestText": "Гость", "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Внимание", @@ -120,7 +129,6 @@ "SSE.Controllers.LeftMenu.warnDownloadAs": "Если Вы продолжите сохранение в этот формат, весь функционал, кроме текста, будет потерян.
Вы действительно хотите продолжить?", "SSE.Controllers.Main.confirmMoveCellRange": "Конечный диапазон ячеек может содержать данные. Продолжить операцию?", "SSE.Controllers.Main.confirmPutMergeRange": "Исходные данные содержали объединенные ячейки.
Перед вставкой этих ячеек в таблицу объединение было отменено.", - "SSE.Controllers.Main.convertationErrorText": "Конвертация не удалась.", "SSE.Controllers.Main.convertationTimeoutText": "Превышено время ожидания конвертации.", "SSE.Controllers.Main.criticalErrorExtText": "Нажмите \"OK\", чтобы вернуться к списку документов.", "SSE.Controllers.Main.criticalErrorTitle": "Ошибка", @@ -164,7 +172,7 @@ "SSE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", "SSE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "SSE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", - "SSE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать его до восстановления подключения.", + "SSE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать или напечатать его до восстановления подключения.", "SSE.Controllers.Main.errorWrongBracketsCount": "Ошибка во введенной формуле.
Использовано неверное количество скобок.", "SSE.Controllers.Main.errorWrongOperator": "Ошибка во введенной формуле. Использован неправильный оператор.
Пожалуйста, исправьте ошибку или нажмите клавишу Esc, чтобы отменить редактирование формулы.", "SSE.Controllers.Main.leavePageText": "Электронная таблица содержит несохраненные изменения. Чтобы сохранить их, нажмите 'Остаться на этой странице', затем 'Сохранить'. Нажмите 'Покинуть эту страницу', чтобы сбросить все несохраненные изменения.", @@ -178,6 +186,7 @@ "SSE.Controllers.Main.loadImageTitleText": "Загрузка изображения", "SSE.Controllers.Main.loadingDocumentTitleText": "Загрузка таблицы", "SSE.Controllers.Main.notcriticalErrorTitle": "Предупреждение", + "SSE.Controllers.Main.openErrorText": "При открытии файла произошла ошибка", "SSE.Controllers.Main.openTextText": "Открытие электронной таблицы...", "SSE.Controllers.Main.openTitleText": "Открытие электронной таблицы", "SSE.Controllers.Main.pastInMergeAreaError": "Нельзя изменить часть объединенной ячейки", @@ -186,6 +195,7 @@ "SSE.Controllers.Main.reloadButtonText": "Обновить страницу", "SSE.Controllers.Main.requestEditFailedMessageText": "В настоящее время документ редактируется. Пожалуйста, попробуйте позже.", "SSE.Controllers.Main.requestEditFailedTitleText": "Доступ запрещен", + "SSE.Controllers.Main.saveErrorText": "При сохранении файла произошла ошибка", "SSE.Controllers.Main.savePreparingText": "Подготовка к сохранению", "SSE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "SSE.Controllers.Main.saveTextText": "Сохранение электронной таблицы...", @@ -204,6 +214,7 @@ "SSE.Controllers.Main.textStrict": "Строгий режим", "SSE.Controllers.Main.textTryUndoRedo": "Функции отмены и повтора действий отключены в Быстром режиме совместного редактирования.
Нажмите на кнопку 'Строгий режим' для переключения в Строгий режим совместного редактирования, чтобы редактировать файл без вмешательства других пользователей и отправлять изменения только после того, как вы их сохраните. Переключаться между режимами совместного редактирования можно с помощью Дополнительных параметров редактора.", "SSE.Controllers.Main.textYes": "Да", + "SSE.Controllers.Main.titleLicenseExp": "Истек срок действия лицензии", "SSE.Controllers.Main.titleRecalcFormulas": "Вычисление...", "SSE.Controllers.Main.txtArt": "Введите ваш текст", "SSE.Controllers.Main.txtBasicShapes": "Основные фигуры", @@ -229,6 +240,7 @@ "SSE.Controllers.Main.uploadImageTitleText": "Загрузка изображения", "SSE.Controllers.Main.warnBrowserIE9": "В IE9 приложение имеет низкую производительность. Используйте IE10 или более позднюю версию.", "SSE.Controllers.Main.warnBrowserZoom": "Текущее значение масштаба страницы в браузере поддерживается не полностью. Вернитесь к масштабу по умолчанию, нажав Ctrl+0", + "SSE.Controllers.Main.warnLicenseExp": "Истек срок действия лицензии.
Обновите лицензию, а затем обновите страницу.", "SSE.Controllers.Main.warnNoLicense": "Вы используете open source версию ONLYOFFICE. Эта версия имеет ограничения по количеству одновременных подключений к серверу документов (20 подключений одновременно).
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "SSE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "SSE.Controllers.Print.strAllSheets": "Все листы", @@ -284,6 +296,7 @@ "SSE.Views.CellEditor.textManager": "Диспетчер имен", "SSE.Views.CellEditor.tipFormula": "Вставить функцию", "SSE.Views.CellRangeDialog.errorMaxRows": "ОШИБКА! Максимальное число рядов данных для одной диаграммы - 255", + "SSE.Views.CellRangeDialog.errorStockChart": "Неверный порядок строк. Чтобы создать биржевую диаграмму, расположите данные на листе в следующем порядке:
цена открытия, максимальная цена, минимальная цена, цена закрытия.", "SSE.Views.CellRangeDialog.textCancel": "Отмена", "SSE.Views.CellRangeDialog.txtEmpty": "Это поле обязательно для заполнения", "SSE.Views.CellRangeDialog.txtInvalidRange": "ОШИБКА! Недопустимый диапазон ячеек", @@ -299,9 +312,12 @@ "SSE.Views.ChartSettings.textLine": "График", "SSE.Views.ChartSettings.textPie": "Круговая", "SSE.Views.ChartSettings.textPoint": "Точечная", + "SSE.Views.ChartSettings.textRanges": "Диапазон данных", + "SSE.Views.ChartSettings.textSelectData": "Выбор данных", "SSE.Views.ChartSettings.textSize": "Размер", "SSE.Views.ChartSettings.textStock": "Биржевая", "SSE.Views.ChartSettings.textStyle": "Стиль", + "SSE.Views.ChartSettings.textType": "Тип", "SSE.Views.ChartSettings.textWidth": "Ширина", "SSE.Views.ChartSettingsDlg.cancelButtonText": "Отмена", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ОШИБКА! Максимальное число рядов данных для одной диаграммы - 255", @@ -315,6 +331,7 @@ "SSE.Views.ChartSettingsDlg.textBar": "Линейчатая", "SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Между делениями", "SSE.Views.ChartSettingsDlg.textBillions": "Миллиарды", + "SSE.Views.ChartSettingsDlg.textBottom": "Снизу", "SSE.Views.ChartSettingsDlg.textCategoryName": "Название категории", "SSE.Views.ChartSettingsDlg.textCenter": "По центру", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Элементы диаграммы и
легенда диаграммы", @@ -328,6 +345,7 @@ "SSE.Views.ChartSettingsDlg.textDataRows": "в строках", "SSE.Views.ChartSettingsDlg.textDataSeries": "Ряд данных", "SSE.Views.ChartSettingsDlg.textDisplayLegend": "Показывать легенду", + "SSE.Views.ChartSettingsDlg.textFit": "По ширине", "SSE.Views.ChartSettingsDlg.textFixed": "Фиксированный", "SSE.Views.ChartSettingsDlg.textGridLines": "Линии сетки", "SSE.Views.ChartSettingsDlg.textHide": "Скрыть", @@ -348,6 +366,7 @@ "SSE.Views.ChartSettingsDlg.textLabelOptions": "Параметры подписи", "SSE.Views.ChartSettingsDlg.textLabelPos": "Положение подписи", "SSE.Views.ChartSettingsDlg.textLayout": "Макет", + "SSE.Views.ChartSettingsDlg.textLeft": "Слева", "SSE.Views.ChartSettingsDlg.textLeftOverlay": "Наложение слева", "SSE.Views.ChartSettingsDlg.textLegendBottom": "Снизу", "SSE.Views.ChartSettingsDlg.textLegendLeft": "Слева", @@ -378,6 +397,7 @@ "SSE.Views.ChartSettingsDlg.textPie": "Круговая", "SSE.Views.ChartSettingsDlg.textPoint": "Точечная", "SSE.Views.ChartSettingsDlg.textReverse": "Значения в обратном порядке", + "SSE.Views.ChartSettingsDlg.textRight": "Справа", "SSE.Views.ChartSettingsDlg.textRightOverlay": "Наложение справа", "SSE.Views.ChartSettingsDlg.textRotated": "Повернутое", "SSE.Views.ChartSettingsDlg.textSelectData": "Выбор данных", @@ -397,6 +417,7 @@ "SSE.Views.ChartSettingsDlg.textThousands": "Тысячи", "SSE.Views.ChartSettingsDlg.textTickOptions": "Параметры делений", "SSE.Views.ChartSettingsDlg.textTitle": "Диаграмма - Дополнительные параметры", + "SSE.Views.ChartSettingsDlg.textTop": "Сверху", "SSE.Views.ChartSettingsDlg.textTrillions": "Триллионы", "SSE.Views.ChartSettingsDlg.textType": "Тип", "SSE.Views.ChartSettingsDlg.textTypeData": "Тип и данные", @@ -456,7 +477,7 @@ "SSE.Views.DocumentHolder.textArrangeForward": "Перенести вперед", "SSE.Views.DocumentHolder.textArrangeFront": "Вынести на передний план", "SSE.Views.DocumentHolder.textFreezePanes": "Закрепить области", - "SSE.Views.DocumentHolder.textUnFreezePanes": "Unfreeze Panes", + "SSE.Views.DocumentHolder.textUnFreezePanes": "Снять закрепление областей", "SSE.Views.DocumentHolder.topCellText": "По верхнему краю", "SSE.Views.DocumentHolder.txtAddComment": "Добавить комментарий", "SSE.Views.DocumentHolder.txtAddNamedRange": "Присвоить имя", @@ -506,12 +527,14 @@ "SSE.Views.DocumentHolder.txtWidth": "Ширина", "SSE.Views.DocumentHolder.vertAlignText": "Вертикальное выравнивание", "SSE.Views.FileMenu.btnBackCaption": "Перейти к Документам", + "SSE.Views.FileMenu.btnCloseMenuCaption": "Закрыть меню", "SSE.Views.FileMenu.btnCreateNewCaption": "Создать новую", "SSE.Views.FileMenu.btnDownloadCaption": "Скачать как...", "SSE.Views.FileMenu.btnHelpCaption": "Справка...", "SSE.Views.FileMenu.btnInfoCaption": "Сведения о таблице...", "SSE.Views.FileMenu.btnPrintCaption": "Печать", "SSE.Views.FileMenu.btnRecentFilesCaption": "Открыть последние...", + "SSE.Views.FileMenu.btnRenameCaption": "Переименовать...", "SSE.Views.FileMenu.btnReturnCaption": "Вернуться к таблице", "SSE.Views.FileMenu.btnRightsCaption": "Права доступа...", "SSE.Views.FileMenu.btnSaveAsCaption": "Сохранить как", From c40b96d685fa44248be9d7e413c01b565a3d5e76 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 26 Oct 2016 13:30:55 +0300 Subject: [PATCH 05/36] Update translations. --- apps/presentationeditor/main/locale/en.json | 135 ++++--- apps/presentationeditor/main/locale/ru.json | 399 +++++++++++++++++++ apps/spreadsheeteditor/main/locale/en.json | 141 ++++--- apps/spreadsheeteditor/main/locale/ru.json | 401 ++++++++++++++++++++ 4 files changed, 937 insertions(+), 139 deletions(-) diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index a85d361a4..d7c7b3516 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -114,7 +114,6 @@ "PE.Controllers.LeftMenu.textNoTextFound": "The data you have been searching for could not be found. Please adjust your search options.", "PE.Controllers.Main.applyChangesTextText": "Loading data...", "PE.Controllers.Main.applyChangesTitleText": "Loading Data", - "del_PE.Controllers.Main.convertationErrorText": "Conversion failed.", "PE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.", "PE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.", "PE.Controllers.Main.criticalErrorTitle": "Error", @@ -242,11 +241,10 @@ "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?", - "PE.Controllers.Toolbar.textEmptyImgUrl": "You need to specify image URL.", - "PE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.
Please enter a numeric value between 1 and 100", - "PE.Controllers.Toolbar.textWarning": "Warning", "PE.Controllers.Toolbar.textAccent": "Accents", "PE.Controllers.Toolbar.textBracket": "Brackets", + "PE.Controllers.Toolbar.textEmptyImgUrl": "You need to specify image URL.", + "PE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.
Please enter a numeric value between 1 and 100", "PE.Controllers.Toolbar.textFraction": "Fractions", "PE.Controllers.Toolbar.textFunction": "Functions", "PE.Controllers.Toolbar.textIntegral": "Integrals", @@ -257,6 +255,7 @@ "PE.Controllers.Toolbar.textRadical": "Radicals", "PE.Controllers.Toolbar.textScript": "Scripts", "PE.Controllers.Toolbar.textSymbols": "Symbols", + "PE.Controllers.Toolbar.textWarning": "Warning", "PE.Controllers.Toolbar.txtAccent_Accent": "Acute", "PE.Controllers.Toolbar.txtAccent_ArrowD": "Right-Left Arrow Above", "PE.Controllers.Toolbar.txtAccent_ArrowL": "Leftwards Arrow Above", @@ -643,92 +642,92 @@ "PE.Views.DocumentHolder.textSlideSettings": "Slide Settings", "PE.Views.DocumentHolder.tipIsLocked": "This element is currently being edited by another user.", "PE.Views.DocumentHolder.topCellText": "Align Top", + "PE.Views.DocumentHolder.txtAddBottom": "Add bottom border", + "PE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar", + "PE.Views.DocumentHolder.txtAddHor": "Add horizontal line", + "PE.Views.DocumentHolder.txtAddLB": "Add left bottom line", + "PE.Views.DocumentHolder.txtAddLeft": "Add left border", + "PE.Views.DocumentHolder.txtAddLT": "Add left top line", + "PE.Views.DocumentHolder.txtAddRight": "Add right border", + "PE.Views.DocumentHolder.txtAddTop": "Add top border", + "PE.Views.DocumentHolder.txtAddVer": "Add vertical line", "PE.Views.DocumentHolder.txtAlign": "Align", + "PE.Views.DocumentHolder.txtAlignToChar": "Align to character", "PE.Views.DocumentHolder.txtArrange": "Arrange", "PE.Views.DocumentHolder.txtBackground": "Background", + "PE.Views.DocumentHolder.txtBorderProps": "Border properties", + "PE.Views.DocumentHolder.txtBottom": "Bottom", "PE.Views.DocumentHolder.txtChangeLayout": "Change Layout", + "PE.Views.DocumentHolder.txtColumnAlign": "Column alignment", + "PE.Views.DocumentHolder.txtDecreaseArg": "Decrease argument size", + "PE.Views.DocumentHolder.txtDeleteArg": "Delete argument", + "PE.Views.DocumentHolder.txtDeleteBreak": "Delete manual break", + "PE.Views.DocumentHolder.txtDeleteChars": "Delete enclosing characters", + "PE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Delete enclosing characters and separators", + "PE.Views.DocumentHolder.txtDeleteEq": "Delete equation", + "PE.Views.DocumentHolder.txtDeleteGroupChar": "Delete char", + "PE.Views.DocumentHolder.txtDeleteRadical": "Delete radical", "PE.Views.DocumentHolder.txtDeleteSlide": "Delete Slide", "PE.Views.DocumentHolder.txtDistribHor": "Distribute Horizontally", "PE.Views.DocumentHolder.txtDistribVert": "Distribute Vertically", "PE.Views.DocumentHolder.txtDuplicateSlide": "Duplicate Slide", + "PE.Views.DocumentHolder.txtFractionLinear": "Change to linear fraction", + "PE.Views.DocumentHolder.txtFractionSkewed": "Change to skewed fraction", + "PE.Views.DocumentHolder.txtFractionStacked": "Change to stacked fraction", "PE.Views.DocumentHolder.txtGroup": "Group", + "PE.Views.DocumentHolder.txtGroupCharOver": "Char over text", + "PE.Views.DocumentHolder.txtGroupCharUnder": "Char under text", + "PE.Views.DocumentHolder.txtHideBottom": "Hide bottom border", + "PE.Views.DocumentHolder.txtHideBottomLimit": "Hide bottom limit", + "PE.Views.DocumentHolder.txtHideCloseBracket": "Hide closing bracket", + "PE.Views.DocumentHolder.txtHideDegree": "Hide degree", + "PE.Views.DocumentHolder.txtHideHor": "Hide horizontal line", + "PE.Views.DocumentHolder.txtHideLB": "Hide left bottom line", + "PE.Views.DocumentHolder.txtHideLeft": "Hide left border", + "PE.Views.DocumentHolder.txtHideLT": "Hide left top line", + "PE.Views.DocumentHolder.txtHideOpenBracket": "Hide opening bracket", + "PE.Views.DocumentHolder.txtHidePlaceholder": "Hide placeholder", + "PE.Views.DocumentHolder.txtHideRight": "Hide right border", + "PE.Views.DocumentHolder.txtHideTop": "Hide top border", + "PE.Views.DocumentHolder.txtHideTopLimit": "Hide top limit", + "PE.Views.DocumentHolder.txtHideVer": "Hide vertical line", + "PE.Views.DocumentHolder.txtIncreaseArg": "Increase argument size", + "PE.Views.DocumentHolder.txtInsertArgAfter": "Insert argument after", + "PE.Views.DocumentHolder.txtInsertArgBefore": "Insert argument before", + "PE.Views.DocumentHolder.txtInsertBreak": "Insert manual break", + "PE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after", + "PE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before", + "PE.Views.DocumentHolder.txtLimitChange": "Change limits location", + "PE.Views.DocumentHolder.txtLimitOver": "Limit over text", + "PE.Views.DocumentHolder.txtLimitUnder": "Limit under text", + "PE.Views.DocumentHolder.txtMatchBrackets": "Match brackets to argument height", + "PE.Views.DocumentHolder.txtMatrixAlign": "Matrix alignment", "PE.Views.DocumentHolder.txtNewSlide": "New Slide", + "PE.Views.DocumentHolder.txtOverbar": "Bar over text", "PE.Views.DocumentHolder.txtPressLink": "Press CTRL and click link", "PE.Views.DocumentHolder.txtPreview": "Start slideshow", - "PE.Views.DocumentHolder.txtSelectAll": "Select All", - "PE.Views.DocumentHolder.txtSlide": "Slide", - "PE.Views.DocumentHolder.txtUngroup": "Ungroup", - "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "PE.Views.DocumentHolder.txtRemFractionBar": "Remove fraction bar", + "PE.Views.DocumentHolder.txtRemLimit": "Remove limit", "PE.Views.DocumentHolder.txtRemoveAccentChar": "Remove accent character", - "PE.Views.DocumentHolder.txtBorderProps": "Borders property", - "PE.Views.DocumentHolder.txtHideTop": "Hide top border", - "PE.Views.DocumentHolder.txtHideBottom": "Hide bottom border", - "PE.Views.DocumentHolder.txtHideLeft": "Hide left border", - "PE.Views.DocumentHolder.txtHideRight": "Hide right border", - "PE.Views.DocumentHolder.txtHideHor": "Hide horizontal line", - "PE.Views.DocumentHolder.txtHideVer": "Hide vertical line", - "PE.Views.DocumentHolder.txtHideLT": "Hide left top line", - "PE.Views.DocumentHolder.txtHideLB": "Hide left bottom line", - "PE.Views.DocumentHolder.txtAddTop": "Add top border", - "PE.Views.DocumentHolder.txtAddBottom": "Add bottom border", - "PE.Views.DocumentHolder.txtAddLeft": "Add left border", - "PE.Views.DocumentHolder.txtAddRight": "Add right border", - "PE.Views.DocumentHolder.txtAddHor": "Add horizontal line", - "PE.Views.DocumentHolder.txtAddVer": "Add vertical line", - "PE.Views.DocumentHolder.txtAddLT": "Add left top line", - "PE.Views.DocumentHolder.txtAddLB": "Add left bottom line", "PE.Views.DocumentHolder.txtRemoveBar": "Remove bar", - "PE.Views.DocumentHolder.txtOverbar": "Bar over text", - "PE.Views.DocumentHolder.txtUnderbar": "Bar under text", "PE.Views.DocumentHolder.txtRemScripts": "Remove scripts", "PE.Views.DocumentHolder.txtRemSubscript": "Remove subscript", "PE.Views.DocumentHolder.txtRemSuperscript": "Remove superscript", "PE.Views.DocumentHolder.txtScriptsAfter": "Scripts after text", "PE.Views.DocumentHolder.txtScriptsBefore": "Scripts before text", - "PE.Views.DocumentHolder.txtFractionStacked": "Change to stacked fraction", - "PE.Views.DocumentHolder.txtFractionSkewed": "Change to skewed fraction", - "PE.Views.DocumentHolder.txtFractionLinear": "Change to linear fraction", - "PE.Views.DocumentHolder.txtRemFractionBar": "Remove fraction bar", - "PE.Views.DocumentHolder.txtAddFractionBar": "Add fraction bar", - "PE.Views.DocumentHolder.txtRemLimit": "Remove limit", - "PE.Views.DocumentHolder.txtLimitOver": "Limit over text", - "PE.Views.DocumentHolder.txtLimitUnder": "Limit under text", - "PE.Views.DocumentHolder.txtHidePlaceholder": "Hide placeholder", - "PE.Views.DocumentHolder.txtShowPlaceholder": "Show placeholder", - "PE.Views.DocumentHolder.txtMatrixAlign": "Matrix alignment", - "PE.Views.DocumentHolder.txtColumnAlign": "Column alignment", - "PE.Views.DocumentHolder.txtTop": "Top", - "PE.Views.DocumentHolder.txtBottom": "Bottom", - "PE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before", - "PE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after", - "PE.Views.DocumentHolder.txtDeleteEq": "Delete equation", - "PE.Views.DocumentHolder.txtLimitChange": "Change limits location", - "PE.Views.DocumentHolder.txtHideTopLimit": "Hide top limit", - "PE.Views.DocumentHolder.txtShowTopLimit": "Show top limit", - "PE.Views.DocumentHolder.txtHideBottomLimit": "Hide bottom limit", + "PE.Views.DocumentHolder.txtSelectAll": "Select All", "PE.Views.DocumentHolder.txtShowBottomLimit": "Show bottom limit", - "PE.Views.DocumentHolder.txtInsertArgBefore": "Insert argument before", - "PE.Views.DocumentHolder.txtInsertArgAfter": "Insert argument after", - "PE.Views.DocumentHolder.txtDeleteArg": "Delete argument", - "PE.Views.DocumentHolder.txtHideOpenBracket": "Hide opening bracket", - "PE.Views.DocumentHolder.txtShowOpenBracket": "Show opening bracket", - "PE.Views.DocumentHolder.txtHideCloseBracket": "Hide closing bracket", "PE.Views.DocumentHolder.txtShowCloseBracket": "Show closing bracket", - "PE.Views.DocumentHolder.txtStretchBrackets": "Stretch brackets", - "PE.Views.DocumentHolder.txtMatchBrackets": "Match brackets to argument height", - "PE.Views.DocumentHolder.txtGroupCharOver": "Char over text", - "PE.Views.DocumentHolder.txtGroupCharUnder": "Char under text", - "PE.Views.DocumentHolder.txtDeleteGroupChar": "Delete char", - "PE.Views.DocumentHolder.txtHideDegree": "Hide degree", "PE.Views.DocumentHolder.txtShowDegree": "Show degree", - "PE.Views.DocumentHolder.txtIncreaseArg": "Increase argument size", - "PE.Views.DocumentHolder.txtDecreaseArg": "Decrease argument size", - "PE.Views.DocumentHolder.txtInsertBreak": "Insert manual break", - "PE.Views.DocumentHolder.txtDeleteBreak": "Delete manual break", - "PE.Views.DocumentHolder.txtAlignToChar": "Align to character", - "PE.Views.DocumentHolder.txtDeleteRadical": "Delete radical", - "PE.Views.DocumentHolder.txtDeleteChars": "Delete enclosing characters", - "PE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Delete enclosing characters and separators", + "PE.Views.DocumentHolder.txtShowOpenBracket": "Show opening bracket", + "PE.Views.DocumentHolder.txtShowPlaceholder": "Show placeholder", + "PE.Views.DocumentHolder.txtShowTopLimit": "Show top limit", + "PE.Views.DocumentHolder.txtSlide": "Slide", + "PE.Views.DocumentHolder.txtStretchBrackets": "Stretch brackets", + "PE.Views.DocumentHolder.txtTop": "Top", + "PE.Views.DocumentHolder.txtUnderbar": "Bar under text", + "PE.Views.DocumentHolder.txtUngroup": "Ungroup", + "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", "PE.Views.DocumentPreview.goToSlideText": "Go to Slide", "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}", "PE.Views.DocumentPreview.txtClose": "Close Slideshow", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 4ef5ce5a6..6cbaae64d 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -241,9 +241,337 @@ "PE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", "PE.Controllers.Statusbar.zoomText": "Масштаб {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы собираетесь сохранить, недоступен на этом устройстве.
Стиль текста будет отображаться с использованием одного из системных шрифтов; сохраненный шрифт будет использоваться, когда он будет доступен.
Вы хотите продолжить?", + "PE.Controllers.Toolbar.textAccent": "Диакритические знаки", + "PE.Controllers.Toolbar.textBracket": "Скобки", "PE.Controllers.Toolbar.textEmptyImgUrl": "Необходимо указать URL изображения.", "PE.Controllers.Toolbar.textFontSizeErr": "Введенное значение некорректно.
Введите числовое значение от 1 до 100", + "PE.Controllers.Toolbar.textFraction": "Дроби", + "PE.Controllers.Toolbar.textFunction": "Функции", + "PE.Controllers.Toolbar.textIntegral": "Интегралы", + "PE.Controllers.Toolbar.textLargeOperator": "Крупные операторы", + "PE.Controllers.Toolbar.textLimitAndLog": "Пределы и логарифмы", + "PE.Controllers.Toolbar.textMatrix": "Матрицы", + "PE.Controllers.Toolbar.textOperator": "Операторы", + "PE.Controllers.Toolbar.textRadical": "Радикалы", + "PE.Controllers.Toolbar.textScript": "Индексы", + "PE.Controllers.Toolbar.textSymbols": "Символы", "PE.Controllers.Toolbar.textWarning": "Предупреждение", + "PE.Controllers.Toolbar.txtAccent_Accent": "Ударение", + "PE.Controllers.Toolbar.txtAccent_ArrowD": "Стрелка вправо-влево сверху", + "PE.Controllers.Toolbar.txtAccent_ArrowL": "Стрелка влево сверху", + "PE.Controllers.Toolbar.txtAccent_ArrowR": "Стрелка вправо сверху", + "PE.Controllers.Toolbar.txtAccent_Bar": "Черта", + "PE.Controllers.Toolbar.txtAccent_BarBot": "Черта снизу", + "PE.Controllers.Toolbar.txtAccent_BarTop": "Черта сверху", + "PE.Controllers.Toolbar.txtAccent_BorderBox": "Формула в рамке (с заполнителем)", + "PE.Controllers.Toolbar.txtAccent_BorderBoxCustom": "Формула в рамке (пример)", + "PE.Controllers.Toolbar.txtAccent_Check": "Галочка", + "PE.Controllers.Toolbar.txtAccent_CurveBracketBot": "Фигурная скобка снизу", + "PE.Controllers.Toolbar.txtAccent_CurveBracketTop": "Фигурная скобка сверху", + "PE.Controllers.Toolbar.txtAccent_Custom_1": "Вектор A", + "PE.Controllers.Toolbar.txtAccent_Custom_2": "ABC с чертой сверху", + "PE.Controllers.Toolbar.txtAccent_Custom_3": "x XOR y с чертой сверху", + "PE.Controllers.Toolbar.txtAccent_DDDot": "Три точки", + "PE.Controllers.Toolbar.txtAccent_DDot": "Две точки", + "PE.Controllers.Toolbar.txtAccent_Dot": "Точка", + "PE.Controllers.Toolbar.txtAccent_DoubleBar": "Двойная черта сверху", + "PE.Controllers.Toolbar.txtAccent_Grave": "Тупое ударение", + "PE.Controllers.Toolbar.txtAccent_GroupBot": "Группирующий знак снизу", + "PE.Controllers.Toolbar.txtAccent_GroupTop": "Группирующий знак сверху", + "PE.Controllers.Toolbar.txtAccent_HarpoonL": "Гарпун влево сверху", + "PE.Controllers.Toolbar.txtAccent_HarpoonR": "Гарпун вправо сверху", + "PE.Controllers.Toolbar.txtAccent_Hat": "Крышка", + "PE.Controllers.Toolbar.txtAccent_Smile": "Значок краткости", + "PE.Controllers.Toolbar.txtAccent_Tilde": "Тильда", + "PE.Controllers.Toolbar.txtBracket_Angle": "Скобки", + "PE.Controllers.Toolbar.txtBracket_Angle_Delimiter_2": "Скобки и разделители", + "PE.Controllers.Toolbar.txtBracket_Angle_Delimiter_3": "Скобки и разделители", + "PE.Controllers.Toolbar.txtBracket_Angle_NoneOpen": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_Angle_OpenNone": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_Curve": "Скобки", + "PE.Controllers.Toolbar.txtBracket_Curve_Delimiter_2": "Скобки и разделители", + "PE.Controllers.Toolbar.txtBracket_Curve_NoneOpen": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_Curve_OpenNone": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_Custom_1": "Наборы условий (два условия)", + "PE.Controllers.Toolbar.txtBracket_Custom_2": "Наборы условий (три условия)", + "PE.Controllers.Toolbar.txtBracket_Custom_3": "Стопка объектов", + "PE.Controllers.Toolbar.txtBracket_Custom_4": "Стопка объектов", + "PE.Controllers.Toolbar.txtBracket_Custom_5": "Наборы условий (пример)", + "PE.Controllers.Toolbar.txtBracket_Custom_6": "Биномиальный коэффициент", + "PE.Controllers.Toolbar.txtBracket_Custom_7": "Биномиальный коэффициент", + "PE.Controllers.Toolbar.txtBracket_Line": "Скобки", + "PE.Controllers.Toolbar.txtBracket_Line_NoneOpen": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_Line_OpenNone": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_LineDouble": "Скобки", + "PE.Controllers.Toolbar.txtBracket_LineDouble_NoneOpen": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_LineDouble_OpenNone": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_LowLim": "Скобки", + "PE.Controllers.Toolbar.txtBracket_LowLim_NoneNone": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_LowLim_OpenNone": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_Round": "Скобки", + "PE.Controllers.Toolbar.txtBracket_Round_Delimiter_2": "Скобки и разделители", + "PE.Controllers.Toolbar.txtBracket_Round_NoneOpen": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_Round_OpenNone": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_Square": "Скобки", + "PE.Controllers.Toolbar.txtBracket_Square_CloseClose": "Скобки", + "PE.Controllers.Toolbar.txtBracket_Square_CloseOpen": "Скобки", + "PE.Controllers.Toolbar.txtBracket_Square_NoneOpen": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_Square_OpenNone": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_Square_OpenOpen": "Скобки", + "PE.Controllers.Toolbar.txtBracket_SquareDouble": "Скобки", + "PE.Controllers.Toolbar.txtBracket_SquareDouble_NoneOpen": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_SquareDouble_OpenNone": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_UppLim": "Скобки", + "PE.Controllers.Toolbar.txtBracket_UppLim_NoneOpen": "Отдельная скобка", + "PE.Controllers.Toolbar.txtBracket_UppLim_OpenNone": "Отдельная скобка", + "PE.Controllers.Toolbar.txtFractionDiagonal": "Диагональная простая дробь", + "PE.Controllers.Toolbar.txtFractionDifferential_1": "Дифференциал", + "PE.Controllers.Toolbar.txtFractionDifferential_2": "Дифференциал", + "PE.Controllers.Toolbar.txtFractionDifferential_3": "Дифференциал", + "PE.Controllers.Toolbar.txtFractionDifferential_4": "Дифференциал", + "PE.Controllers.Toolbar.txtFractionHorizontal": "Горизонтальная простая дробь", + "PE.Controllers.Toolbar.txtFractionPi_2": "Пи разделить на два", + "PE.Controllers.Toolbar.txtFractionSmall": "Маленькая простая дробь", + "PE.Controllers.Toolbar.txtFractionVertical": "Вертикальная простая дробь", + "PE.Controllers.Toolbar.txtFunction_1_Cos": "Арккосинус", + "PE.Controllers.Toolbar.txtFunction_1_Cosh": "Гиперболический арккосинус", + "PE.Controllers.Toolbar.txtFunction_1_Cot": "Арккотангенс", + "PE.Controllers.Toolbar.txtFunction_1_Coth": "Гиперболический арккотангенс", + "PE.Controllers.Toolbar.txtFunction_1_Csc": "Арккосеканс", + "PE.Controllers.Toolbar.txtFunction_1_Csch": "Гиперболический арккосеканс", + "PE.Controllers.Toolbar.txtFunction_1_Sec": "Арксеканс", + "PE.Controllers.Toolbar.txtFunction_1_Sech": "Гиперболический арксеканс", + "PE.Controllers.Toolbar.txtFunction_1_Sin": "Арксинус", + "PE.Controllers.Toolbar.txtFunction_1_Sinh": "Гиперболический арксинус", + "PE.Controllers.Toolbar.txtFunction_1_Tan": "Арктангенс", + "PE.Controllers.Toolbar.txtFunction_1_Tanh": "Гиперболический арктангенс", + "PE.Controllers.Toolbar.txtFunction_Cos": "Косинус", + "PE.Controllers.Toolbar.txtFunction_Cosh": "Гиперболический косинус", + "PE.Controllers.Toolbar.txtFunction_Cot": "Котангенс", + "PE.Controllers.Toolbar.txtFunction_Coth": "Гиперболический котангенс", + "PE.Controllers.Toolbar.txtFunction_Csc": "Косеканс", + "PE.Controllers.Toolbar.txtFunction_Csch": "Гиперболический косеканс", + "PE.Controllers.Toolbar.txtFunction_Custom_1": "Sin θ", + "PE.Controllers.Toolbar.txtFunction_Custom_2": "Cos 2x", + "PE.Controllers.Toolbar.txtFunction_Custom_3": "Формула тангенса", + "PE.Controllers.Toolbar.txtFunction_Sec": "Секанс", + "PE.Controllers.Toolbar.txtFunction_Sech": "Гиперболический секанс", + "PE.Controllers.Toolbar.txtFunction_Sin": "Синус", + "PE.Controllers.Toolbar.txtFunction_Sinh": "Гиперболический синус", + "PE.Controllers.Toolbar.txtFunction_Tan": "Тангенс", + "PE.Controllers.Toolbar.txtFunction_Tanh": "Гиперболический тангенс", + "PE.Controllers.Toolbar.txtIntegral": "Интеграл", + "PE.Controllers.Toolbar.txtIntegral_dtheta": "Дифференциал dθ", + "PE.Controllers.Toolbar.txtIntegral_dx": "Дифференциал dx", + "PE.Controllers.Toolbar.txtIntegral_dy": "Дифференциал dy", + "PE.Controllers.Toolbar.txtIntegralCenterSubSup": "Интеграл", + "PE.Controllers.Toolbar.txtIntegralDouble": "Двойной интеграл", + "PE.Controllers.Toolbar.txtIntegralDoubleCenterSubSup": "Двойной интеграл", + "PE.Controllers.Toolbar.txtIntegralDoubleSubSup": "Двойной интеграл", + "PE.Controllers.Toolbar.txtIntegralOriented": "Контурный интеграл", + "PE.Controllers.Toolbar.txtIntegralOrientedCenterSubSup": "Контурный интеграл", + "PE.Controllers.Toolbar.txtIntegralOrientedDouble": "Интеграл по поверхности", + "PE.Controllers.Toolbar.txtIntegralOrientedDoubleCenterSubSup": "Интеграл по поверхности", + "PE.Controllers.Toolbar.txtIntegralOrientedDoubleSubSup": "Интеграл по поверхности", + "PE.Controllers.Toolbar.txtIntegralOrientedSubSup": "Контурный интеграл", + "PE.Controllers.Toolbar.txtIntegralOrientedTriple": "Интеграл по объему", + "PE.Controllers.Toolbar.txtIntegralOrientedTripleCenterSubSup": "Интеграл по объему", + "PE.Controllers.Toolbar.txtIntegralOrientedTripleSubSup": "Интеграл по объему", + "PE.Controllers.Toolbar.txtIntegralSubSup": "Интеграл", + "PE.Controllers.Toolbar.txtIntegralTriple": "Тройной интеграл", + "PE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Тройной интеграл", + "PE.Controllers.Toolbar.txtIntegralTripleSubSup": "Тройной интеграл", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Клин", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Клин", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Клин", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Клин", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Клин", + "PE.Controllers.Toolbar.txtLargeOperator_CoProd": "Сопроизведение", + "PE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Сопроизведение", + "PE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Сопроизведение", + "PE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Сопроизведение", + "PE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Сопроизведение", + "PE.Controllers.Toolbar.txtLargeOperator_Custom_1": "Сумма", + "PE.Controllers.Toolbar.txtLargeOperator_Custom_2": "Сумма", + "PE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Сумма", + "PE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Произведение", + "PE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Объединение", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Буква V", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Буква V", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Буква V", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Буква V", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Буква V", + "PE.Controllers.Toolbar.txtLargeOperator_Intersection": "Пересечение", + "PE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSub": "Пересечение", + "PE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSubSup": "Пересечение", + "PE.Controllers.Toolbar.txtLargeOperator_Intersection_Sub": "Пересечение", + "PE.Controllers.Toolbar.txtLargeOperator_Intersection_SubSup": "Пересечение", + "PE.Controllers.Toolbar.txtLargeOperator_Prod": "Произведение", + "PE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSub": "Произведение", + "PE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSubSup": "Произведение", + "PE.Controllers.Toolbar.txtLargeOperator_Prod_Sub": "Произведение", + "PE.Controllers.Toolbar.txtLargeOperator_Prod_SubSup": "Произведение", + "PE.Controllers.Toolbar.txtLargeOperator_Sum": "Сумма", + "PE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSub": "Сумма", + "PE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSubSup": "Сумма", + "PE.Controllers.Toolbar.txtLargeOperator_Sum_Sub": "Сумма", + "PE.Controllers.Toolbar.txtLargeOperator_Sum_SubSup": "Сумма", + "PE.Controllers.Toolbar.txtLargeOperator_Union": "Объединение", + "PE.Controllers.Toolbar.txtLargeOperator_Union_CenterSub": "Объединение", + "PE.Controllers.Toolbar.txtLargeOperator_Union_CenterSubSup": "Объединение", + "PE.Controllers.Toolbar.txtLargeOperator_Union_Sub": "Объединение", + "PE.Controllers.Toolbar.txtLargeOperator_Union_SubSup": "Объединение", + "PE.Controllers.Toolbar.txtLimitLog_Custom_1": "Пример предела", + "PE.Controllers.Toolbar.txtLimitLog_Custom_2": "Пример максимума", + "PE.Controllers.Toolbar.txtLimitLog_Lim": "Предел", + "PE.Controllers.Toolbar.txtLimitLog_Ln": "Натуральный логарифм", + "PE.Controllers.Toolbar.txtLimitLog_Log": "Логарифм", + "PE.Controllers.Toolbar.txtLimitLog_LogBase": "Логарифм", + "PE.Controllers.Toolbar.txtLimitLog_Max": "Максимум", + "PE.Controllers.Toolbar.txtLimitLog_Min": "Минимум", + "PE.Controllers.Toolbar.txtMatrix_1_2": "Пустая матрица 1 x 2", + "PE.Controllers.Toolbar.txtMatrix_1_3": "Пустая матрица 1 x 3", + "PE.Controllers.Toolbar.txtMatrix_2_1": "Пустая матрица 2 x 1", + "PE.Controllers.Toolbar.txtMatrix_2_2": "Пустая матрица 2 x 2", + "PE.Controllers.Toolbar.txtMatrix_2_2_DLineBracket": "Пустая матрица со скобками", + "PE.Controllers.Toolbar.txtMatrix_2_2_LineBracket": "Пустая матрица со скобками", + "PE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Пустая матрица со скобками", + "PE.Controllers.Toolbar.txtMatrix_2_2_SquareBracket": "Пустая матрица со скобками", + "PE.Controllers.Toolbar.txtMatrix_2_3": "Пустая матрица 2 x 3", + "PE.Controllers.Toolbar.txtMatrix_3_1": "Пустая матрица 3 x 1", + "PE.Controllers.Toolbar.txtMatrix_3_2": "Пустая матрица 3 x 2", + "PE.Controllers.Toolbar.txtMatrix_3_3": "Пустая матрица 3 x 3", + "PE.Controllers.Toolbar.txtMatrix_Dots_Baseline": "Точки на опорной линии", + "PE.Controllers.Toolbar.txtMatrix_Dots_Center": "Точки посередине", + "PE.Controllers.Toolbar.txtMatrix_Dots_Diagonal": "Точки по диагонали", + "PE.Controllers.Toolbar.txtMatrix_Dots_Vertical": "Точки по вертикали", + "PE.Controllers.Toolbar.txtMatrix_Flat_Round": "Разреженная матрица", + "PE.Controllers.Toolbar.txtMatrix_Flat_Square": "Разреженная матрица", + "PE.Controllers.Toolbar.txtMatrix_Identity_2": "Единичная матрица 2 x 2", + "PE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "Единичная матрица 3 x 3", + "PE.Controllers.Toolbar.txtMatrix_Identity_3": "Единичная матрица 3 x 3", + "PE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "Единичная матрица 3 x 3", + "PE.Controllers.Toolbar.txtOperator_ArrowD_Bot": "Стрелка вправо-влево снизу", + "PE.Controllers.Toolbar.txtOperator_ArrowD_Top": "Стрелка вправо-влево сверху", + "PE.Controllers.Toolbar.txtOperator_ArrowL_Bot": "Стрелка влево снизу", + "PE.Controllers.Toolbar.txtOperator_ArrowL_Top": "Стрелка влево сверху", + "PE.Controllers.Toolbar.txtOperator_ArrowR_Bot": "Стрелка вправо снизу", + "PE.Controllers.Toolbar.txtOperator_ArrowR_Top": "Стрелка вправо сверху", + "PE.Controllers.Toolbar.txtOperator_ColonEquals": "Двоеточие равно", + "PE.Controllers.Toolbar.txtOperator_Custom_1": "Выход", + "PE.Controllers.Toolbar.txtOperator_Custom_2": "Дельта выхода", + "PE.Controllers.Toolbar.txtOperator_Definition": "Равно по определению", + "PE.Controllers.Toolbar.txtOperator_DeltaEquals": "Дельта равна", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowD_Bot": "Стрелка вправо-влево снизу", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowD_Top": "Стрелка вправо-влево сверху", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowL_Bot": "Стрелка влево снизу", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowL_Top": "Стрелка влево сверху", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowR_Bot": "Стрелка вправо снизу", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowR_Top": "Стрелка вправо сверху", + "PE.Controllers.Toolbar.txtOperator_EqualsEquals": "Равно равно", + "PE.Controllers.Toolbar.txtOperator_MinusEquals": "Минус равно", + "PE.Controllers.Toolbar.txtOperator_PlusEquals": "Плюс равно", + "PE.Controllers.Toolbar.txtOperator_UnitOfMeasure": "Единица измерения", + "PE.Controllers.Toolbar.txtRadicalCustom_1": "Радикал", + "PE.Controllers.Toolbar.txtRadicalCustom_2": "Радикал", + "PE.Controllers.Toolbar.txtRadicalRoot_2": "Квадратный корень со степенью", + "PE.Controllers.Toolbar.txtRadicalRoot_3": "Кубический корень", + "PE.Controllers.Toolbar.txtRadicalRoot_n": "Радикал со степенью", + "PE.Controllers.Toolbar.txtRadicalSqrt": "Квадратный корень", + "PE.Controllers.Toolbar.txtScriptCustom_1": "Индекс", + "PE.Controllers.Toolbar.txtScriptCustom_2": "Индекс", + "PE.Controllers.Toolbar.txtScriptCustom_3": "Индекс", + "PE.Controllers.Toolbar.txtScriptCustom_4": "Индекс", + "PE.Controllers.Toolbar.txtScriptSub": "Нижний индекс", + "PE.Controllers.Toolbar.txtScriptSubSup": "Нижний и верхний индексы", + "PE.Controllers.Toolbar.txtScriptSubSupLeft": "Нижний и верхний индексы слева", + "PE.Controllers.Toolbar.txtScriptSup": "Верхний индекс", + "PE.Controllers.Toolbar.txtSymbol_about": "Приблизительно", + "PE.Controllers.Toolbar.txtSymbol_additional": "Дополнение", + "PE.Controllers.Toolbar.txtSymbol_aleph": "Алеф", + "PE.Controllers.Toolbar.txtSymbol_alpha": "Альфа", + "PE.Controllers.Toolbar.txtSymbol_approx": "Почти равно", + "PE.Controllers.Toolbar.txtSymbol_ast": "Оператор-звездочка", + "PE.Controllers.Toolbar.txtSymbol_beta": "Бета", + "PE.Controllers.Toolbar.txtSymbol_beth": "Бет", + "PE.Controllers.Toolbar.txtSymbol_bullet": "Оператор-маркер", + "PE.Controllers.Toolbar.txtSymbol_cap": "Пересечение", + "PE.Controllers.Toolbar.txtSymbol_cbrt": "Кубический корень", + "PE.Controllers.Toolbar.txtSymbol_cdots": "Горизонтальное многоточие посередине", + "PE.Controllers.Toolbar.txtSymbol_celsius": "Градусы Цельсия", + "PE.Controllers.Toolbar.txtSymbol_chi": "Хи", + "PE.Controllers.Toolbar.txtSymbol_cong": "Приблизительно равно", + "PE.Controllers.Toolbar.txtSymbol_cup": "Объединение", + "PE.Controllers.Toolbar.txtSymbol_ddots": "Диагональное многоточие вниз вправо", + "PE.Controllers.Toolbar.txtSymbol_degree": "Градусы", + "PE.Controllers.Toolbar.txtSymbol_delta": "Дельта", + "PE.Controllers.Toolbar.txtSymbol_div": "Знак деления", + "PE.Controllers.Toolbar.txtSymbol_downarrow": "Стрелка вниз", + "PE.Controllers.Toolbar.txtSymbol_emptyset": "Пустое множество", + "PE.Controllers.Toolbar.txtSymbol_epsilon": "Эпсилон", + "PE.Controllers.Toolbar.txtSymbol_equals": "Равно", + "PE.Controllers.Toolbar.txtSymbol_equiv": "Тождественно", + "PE.Controllers.Toolbar.txtSymbol_eta": "Эта", + "PE.Controllers.Toolbar.txtSymbol_exists": "Существует", + "PE.Controllers.Toolbar.txtSymbol_factorial": "Факториал", + "PE.Controllers.Toolbar.txtSymbol_fahrenheit": "Градусы Фаренгейта", + "PE.Controllers.Toolbar.txtSymbol_forall": "Для всех", + "PE.Controllers.Toolbar.txtSymbol_gamma": "Гамма", + "PE.Controllers.Toolbar.txtSymbol_geq": "Больше или равно", + "PE.Controllers.Toolbar.txtSymbol_gg": "Много больше", + "PE.Controllers.Toolbar.txtSymbol_greater": "Больше", + "PE.Controllers.Toolbar.txtSymbol_in": "Является элементом", + "PE.Controllers.Toolbar.txtSymbol_inc": "Приращение", + "PE.Controllers.Toolbar.txtSymbol_infinity": "Бесконечность", + "PE.Controllers.Toolbar.txtSymbol_iota": "Йота", + "PE.Controllers.Toolbar.txtSymbol_kappa": "Каппа", + "PE.Controllers.Toolbar.txtSymbol_lambda": "Лямбда", + "PE.Controllers.Toolbar.txtSymbol_leftarrow": "Стрелка влево", + "PE.Controllers.Toolbar.txtSymbol_leftrightarrow": "Стрелка влево и вправо", + "PE.Controllers.Toolbar.txtSymbol_leq": "Меньше или равно", + "PE.Controllers.Toolbar.txtSymbol_less": "Меньше", + "PE.Controllers.Toolbar.txtSymbol_ll": "Много меньше", + "PE.Controllers.Toolbar.txtSymbol_minus": "Минус", + "PE.Controllers.Toolbar.txtSymbol_mp": "Минус и плюс", + "PE.Controllers.Toolbar.txtSymbol_mu": "Мю", + "PE.Controllers.Toolbar.txtSymbol_nabla": "Набла", + "PE.Controllers.Toolbar.txtSymbol_neq": "Не равно", + "PE.Controllers.Toolbar.txtSymbol_ni": "Содержит как член", + "PE.Controllers.Toolbar.txtSymbol_not": "Знак отрицания", + "PE.Controllers.Toolbar.txtSymbol_notexists": "Не существует", + "PE.Controllers.Toolbar.txtSymbol_nu": "Ню", + "PE.Controllers.Toolbar.txtSymbol_o": "Омикрон", + "PE.Controllers.Toolbar.txtSymbol_omega": "Омега", + "PE.Controllers.Toolbar.txtSymbol_partial": "Частный дифференциал", + "PE.Controllers.Toolbar.txtSymbol_percent": "Процент", + "PE.Controllers.Toolbar.txtSymbol_phi": "Фи", + "PE.Controllers.Toolbar.txtSymbol_pi": "Пи", + "PE.Controllers.Toolbar.txtSymbol_plus": "Плюс", + "PE.Controllers.Toolbar.txtSymbol_pm": "Плюс и минус", + "PE.Controllers.Toolbar.txtSymbol_propto": "Пропорционально", + "PE.Controllers.Toolbar.txtSymbol_psi": "Пси", + "PE.Controllers.Toolbar.txtSymbol_qdrt": "Корень четвертой степени", + "PE.Controllers.Toolbar.txtSymbol_qed": "Что и требовалось доказать", + "PE.Controllers.Toolbar.txtSymbol_rddots": "Диагональное многоточие вверх вправо", + "PE.Controllers.Toolbar.txtSymbol_rho": "Ро", + "PE.Controllers.Toolbar.txtSymbol_rightarrow": "Стрелка вправо", + "PE.Controllers.Toolbar.txtSymbol_sigma": "Сигма", + "PE.Controllers.Toolbar.txtSymbol_sqrt": "Знак радикала", + "PE.Controllers.Toolbar.txtSymbol_tau": "Тау", + "PE.Controllers.Toolbar.txtSymbol_therefore": "Следовательно", + "PE.Controllers.Toolbar.txtSymbol_theta": "Тета", + "PE.Controllers.Toolbar.txtSymbol_times": "Знак умножения", + "PE.Controllers.Toolbar.txtSymbol_uparrow": "Стрелка вверх", + "PE.Controllers.Toolbar.txtSymbol_upsilon": "Ипсилон", + "PE.Controllers.Toolbar.txtSymbol_varepsilon": "Эпсилон (вариант)", + "PE.Controllers.Toolbar.txtSymbol_varphi": "Фи (вариант)", + "PE.Controllers.Toolbar.txtSymbol_varpi": "Пи (вариант)", + "PE.Controllers.Toolbar.txtSymbol_varrho": "Ро (вариант)", + "PE.Controllers.Toolbar.txtSymbol_varsigma": "Сигма (вариант)", + "PE.Controllers.Toolbar.txtSymbol_vartheta": "Тета (вариант)", + "PE.Controllers.Toolbar.txtSymbol_vdots": "Вертикальное многоточие", + "PE.Controllers.Toolbar.txtSymbol_xsi": "Кси", + "PE.Controllers.Toolbar.txtSymbol_zeta": "Дзета", "PE.Views.ChartSettings.textArea": "С областями", "PE.Views.ChartSettings.textBar": "Линейчатая", "PE.Views.ChartSettings.textChartType": "Изменить тип диаграммы", @@ -314,20 +642,90 @@ "PE.Views.DocumentHolder.textSlideSettings": "Параметры слайда", "PE.Views.DocumentHolder.tipIsLocked": "Этот элемент редактируется другим пользователем.", "PE.Views.DocumentHolder.topCellText": "По верхнему краю", + "PE.Views.DocumentHolder.txtAddBottom": "Добавить нижнюю границу", + "PE.Views.DocumentHolder.txtAddFractionBar": "Добавить дробную черту", + "PE.Views.DocumentHolder.txtAddHor": "Добавить горизонтальную линию", + "PE.Views.DocumentHolder.txtAddLB": "Добавить линию из левого нижнего угла", + "PE.Views.DocumentHolder.txtAddLeft": "Добавить левую границу", + "PE.Views.DocumentHolder.txtAddLT": "Добавить линию из левого верхнего угла", + "PE.Views.DocumentHolder.txtAddRight": "Добавить правую границу", + "PE.Views.DocumentHolder.txtAddTop": "Добавить верхнюю границу", + "PE.Views.DocumentHolder.txtAddVer": "Добавить вертикальную линию", "PE.Views.DocumentHolder.txtAlign": "Выравнивание", + "PE.Views.DocumentHolder.txtAlignToChar": "Выравнивание по символу", "PE.Views.DocumentHolder.txtArrange": "Порядок", "PE.Views.DocumentHolder.txtBackground": "Фон", + "PE.Views.DocumentHolder.txtBorderProps": "Свойства границ", + "PE.Views.DocumentHolder.txtBottom": "По нижнему краю", "PE.Views.DocumentHolder.txtChangeLayout": "Изменить макет", + "PE.Views.DocumentHolder.txtColumnAlign": "Выравнивание столбца", + "PE.Views.DocumentHolder.txtDecreaseArg": "Уменьшить размер аргумента", + "PE.Views.DocumentHolder.txtDeleteArg": "Удалить аргумент", + "PE.Views.DocumentHolder.txtDeleteBreak": "Удалить принудительный разрыв", + "PE.Views.DocumentHolder.txtDeleteChars": "Удалить вложенные знаки", + "PE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Удалить вложенные знаки и разделители", + "PE.Views.DocumentHolder.txtDeleteEq": "Удалить формулу", + "PE.Views.DocumentHolder.txtDeleteGroupChar": "Удалить символ", + "PE.Views.DocumentHolder.txtDeleteRadical": "Удалить радикал", "PE.Views.DocumentHolder.txtDeleteSlide": "Удалить слайд", "PE.Views.DocumentHolder.txtDistribHor": "Распределить по горизонтали", "PE.Views.DocumentHolder.txtDistribVert": "Распределить по вертикали", "PE.Views.DocumentHolder.txtDuplicateSlide": "Дублировать слайд", + "PE.Views.DocumentHolder.txtFractionLinear": "Изменить на горизонтальную простую дробь", + "PE.Views.DocumentHolder.txtFractionSkewed": "Изменить на диагональную простую дробь", + "PE.Views.DocumentHolder.txtFractionStacked": "Изменить на вертикальную простую дробь", "PE.Views.DocumentHolder.txtGroup": "Сгруппировать", + "PE.Views.DocumentHolder.txtGroupCharOver": "Символ над текстом", + "PE.Views.DocumentHolder.txtGroupCharUnder": "Символ под текстом", + "PE.Views.DocumentHolder.txtHideBottom": "Скрыть нижнюю границу", + "PE.Views.DocumentHolder.txtHideBottomLimit": "Скрыть нижний предел", + "PE.Views.DocumentHolder.txtHideCloseBracket": "Скрыть закрывающую скобку", + "PE.Views.DocumentHolder.txtHideDegree": "Скрыть степень", + "PE.Views.DocumentHolder.txtHideHor": "Скрыть горизонтальную линию", + "PE.Views.DocumentHolder.txtHideLB": "Скрыть линию из левого нижнего угла", + "PE.Views.DocumentHolder.txtHideLeft": "Скрыть левую границу", + "PE.Views.DocumentHolder.txtHideLT": "Скрыть линию из левого верхнего угла", + "PE.Views.DocumentHolder.txtHideOpenBracket": "Скрыть открывающую скобку", + "PE.Views.DocumentHolder.txtHidePlaceholder": "Скрыть поля для заполнения", + "PE.Views.DocumentHolder.txtHideRight": "Скрыть правую границу", + "PE.Views.DocumentHolder.txtHideTop": "Скрыть верхнюю границу", + "PE.Views.DocumentHolder.txtHideTopLimit": "Скрыть верхний предел", + "PE.Views.DocumentHolder.txtHideVer": "Скрыть вертикальную линию", + "PE.Views.DocumentHolder.txtIncreaseArg": "Увеличить размер аргумента", + "PE.Views.DocumentHolder.txtInsertArgAfter": "Вставить аргумент после", + "PE.Views.DocumentHolder.txtInsertArgBefore": "Вставить аргумент перед", + "PE.Views.DocumentHolder.txtInsertBreak": "Вставить принудительный разрыв", + "PE.Views.DocumentHolder.txtInsertEqAfter": "Вставить формулу после", + "PE.Views.DocumentHolder.txtInsertEqBefore": "Вставить формулу перед", + "PE.Views.DocumentHolder.txtLimitChange": "Изменить положение пределов", + "PE.Views.DocumentHolder.txtLimitOver": "Предел над текстом", + "PE.Views.DocumentHolder.txtLimitUnder": "Предел под текстом", + "PE.Views.DocumentHolder.txtMatchBrackets": "Изменить размер скобок в соответствии с высотой аргумента", + "PE.Views.DocumentHolder.txtMatrixAlign": "Выравнивание матрицы", "PE.Views.DocumentHolder.txtNewSlide": "Новый слайд", + "PE.Views.DocumentHolder.txtOverbar": "Черта над текстом", "PE.Views.DocumentHolder.txtPressLink": "Нажмите клавишу CTRL и щелкните по ссылке", "PE.Views.DocumentHolder.txtPreview": "Начать показ слайдов", + "PE.Views.DocumentHolder.txtRemFractionBar": "Удалить дробную черту", + "PE.Views.DocumentHolder.txtRemLimit": "Удалить предел", + "PE.Views.DocumentHolder.txtRemoveAccentChar": "Удалить диакритический знак", + "PE.Views.DocumentHolder.txtRemoveBar": "Удалить черту", + "PE.Views.DocumentHolder.txtRemScripts": "Удалить индексы", + "PE.Views.DocumentHolder.txtRemSubscript": "Удалить нижний индекс", + "PE.Views.DocumentHolder.txtRemSuperscript": "Удалить верхний индекс", + "PE.Views.DocumentHolder.txtScriptsAfter": "Индексы после текста", + "PE.Views.DocumentHolder.txtScriptsBefore": "Индексы перед текстом", "PE.Views.DocumentHolder.txtSelectAll": "Выделить все", + "PE.Views.DocumentHolder.txtShowBottomLimit": "Показать нижний предел", + "PE.Views.DocumentHolder.txtShowCloseBracket": "Показать закрывающую скобку", + "PE.Views.DocumentHolder.txtShowDegree": "Показать степень", + "PE.Views.DocumentHolder.txtShowOpenBracket": "Показать открывающую скобку", + "PE.Views.DocumentHolder.txtShowPlaceholder": "Показать поля для заполнения", + "PE.Views.DocumentHolder.txtShowTopLimit": "Показать верхний предел", "PE.Views.DocumentHolder.txtSlide": "Слайд", + "PE.Views.DocumentHolder.txtStretchBrackets": "Растянуть скобки", + "PE.Views.DocumentHolder.txtTop": "По верхнему краю", + "PE.Views.DocumentHolder.txtUnderbar": "Черта под текстом", "PE.Views.DocumentHolder.txtUngroup": "Разгруппировать", "PE.Views.DocumentHolder.vertAlignText": "Вертикальное выравнивание", "PE.Views.DocumentPreview.goToSlideText": "Перейти к слайду", @@ -837,6 +1235,7 @@ "PE.Views.Toolbar.tipHideBars": "Скрыть строки заголовка и статуса", "PE.Views.Toolbar.tipIncPrLeft": "Увеличить отступ", "PE.Views.Toolbar.tipInsertChart": "Вставить диаграмму", + "PE.Views.Toolbar.tipInsertEquation": "Вставить формулу", "PE.Views.Toolbar.tipInsertHyperlink": "Добавить гиперссылку", "PE.Views.Toolbar.tipInsertImage": "Вставить изображение", "PE.Views.Toolbar.tipInsertShape": "Вставить автофигуру", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 96b7ea7d7..5c7c5058c 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -108,79 +108,79 @@ "SSE.Controllers.DocumentHolder.textInsertTop": "Insert Top", "SSE.Controllers.DocumentHolder.textSym": "sym", "SSE.Controllers.DocumentHolder.tipIsLocked": "This element is being edited by another user.", - "SSE.Controllers.DocumentHolder.txtHeight": "Height", - "SSE.Controllers.DocumentHolder.txtRowHeight": "Row Height", - "SSE.Controllers.DocumentHolder.txtWidth": "Width", - "SSE.Controllers.DocumentHolder.txtRemoveAccentChar": "Remove accent character", - "SSE.Controllers.DocumentHolder.txtBorderProps": "Borders property", - "SSE.Controllers.DocumentHolder.txtHideTop": "Hide top border", - "SSE.Controllers.DocumentHolder.txtHideBottom": "Hide bottom border", - "SSE.Controllers.DocumentHolder.txtHideLeft": "Hide left border", - "SSE.Controllers.DocumentHolder.txtHideRight": "Hide right border", - "SSE.Controllers.DocumentHolder.txtHideHor": "Hide horizontal line", - "SSE.Controllers.DocumentHolder.txtHideVer": "Hide vertical line", - "SSE.Controllers.DocumentHolder.txtHideLT": "Hide left top line", - "SSE.Controllers.DocumentHolder.txtHideLB": "Hide left bottom line", - "SSE.Controllers.DocumentHolder.txtAddTop": "Add top border", "SSE.Controllers.DocumentHolder.txtAddBottom": "Add bottom border", - "SSE.Controllers.DocumentHolder.txtAddLeft": "Add left border", - "SSE.Controllers.DocumentHolder.txtAddRight": "Add right border", + "SSE.Controllers.DocumentHolder.txtAddFractionBar": "Add fraction bar", "SSE.Controllers.DocumentHolder.txtAddHor": "Add horizontal line", - "SSE.Controllers.DocumentHolder.txtAddVer": "Add vertical line", - "SSE.Controllers.DocumentHolder.txtAddLT": "Add left top line", "SSE.Controllers.DocumentHolder.txtAddLB": "Add left bottom line", - "SSE.Controllers.DocumentHolder.txtRemoveBar": "Remove bar", + "SSE.Controllers.DocumentHolder.txtAddLeft": "Add left border", + "SSE.Controllers.DocumentHolder.txtAddLT": "Add left top line", + "SSE.Controllers.DocumentHolder.txtAddRight": "Add right border", + "SSE.Controllers.DocumentHolder.txtAddTop": "Add top border", + "SSE.Controllers.DocumentHolder.txtAddVer": "Add vertical line", + "SSE.Controllers.DocumentHolder.txtAlignToChar": "Align to character", + "SSE.Controllers.DocumentHolder.txtBorderProps": "Border properties", + "SSE.Controllers.DocumentHolder.txtBottom": "Bottom", + "SSE.Controllers.DocumentHolder.txtColumnAlign": "Column alignment", + "SSE.Controllers.DocumentHolder.txtDecreaseArg": "Decrease argument size", + "SSE.Controllers.DocumentHolder.txtDeleteArg": "Delete argument", + "SSE.Controllers.DocumentHolder.txtDeleteBreak": "Delete manual break", + "SSE.Controllers.DocumentHolder.txtDeleteChars": "Delete enclosing characters", + "SSE.Controllers.DocumentHolder.txtDeleteCharsAndSeparators": "Delete enclosing characters and separators", + "SSE.Controllers.DocumentHolder.txtDeleteEq": "Delete equation", + "SSE.Controllers.DocumentHolder.txtDeleteGroupChar": "Delete char", + "SSE.Controllers.DocumentHolder.txtDeleteRadical": "Delete radical", + "SSE.Controllers.DocumentHolder.txtFractionLinear": "Change to linear fraction", + "SSE.Controllers.DocumentHolder.txtFractionSkewed": "Change to skewed fraction", + "SSE.Controllers.DocumentHolder.txtFractionStacked": "Change to stacked fraction", + "SSE.Controllers.DocumentHolder.txtGroupCharOver": "Char over text", + "SSE.Controllers.DocumentHolder.txtGroupCharUnder": "Char under text", + "SSE.Controllers.DocumentHolder.txtHeight": "Height", + "SSE.Controllers.DocumentHolder.txtHideBottom": "Hide bottom border", + "SSE.Controllers.DocumentHolder.txtHideBottomLimit": "Hide bottom limit", + "SSE.Controllers.DocumentHolder.txtHideCloseBracket": "Hide closing bracket", + "SSE.Controllers.DocumentHolder.txtHideDegree": "Hide degree", + "SSE.Controllers.DocumentHolder.txtHideHor": "Hide horizontal line", + "SSE.Controllers.DocumentHolder.txtHideLB": "Hide left bottom line", + "SSE.Controllers.DocumentHolder.txtHideLeft": "Hide left border", + "SSE.Controllers.DocumentHolder.txtHideLT": "Hide left top line", + "SSE.Controllers.DocumentHolder.txtHideOpenBracket": "Hide opening bracket", + "SSE.Controllers.DocumentHolder.txtHidePlaceholder": "Hide placeholder", + "SSE.Controllers.DocumentHolder.txtHideRight": "Hide right border", + "SSE.Controllers.DocumentHolder.txtHideTop": "Hide top border", + "SSE.Controllers.DocumentHolder.txtHideTopLimit": "Hide top limit", + "SSE.Controllers.DocumentHolder.txtHideVer": "Hide vertical line", + "SSE.Controllers.DocumentHolder.txtIncreaseArg": "Increase argument size", + "SSE.Controllers.DocumentHolder.txtInsertArgAfter": "Insert argument after", + "SSE.Controllers.DocumentHolder.txtInsertArgBefore": "Insert argument before", + "SSE.Controllers.DocumentHolder.txtInsertBreak": "Insert manual break", + "SSE.Controllers.DocumentHolder.txtInsertEqAfter": "Insert equation after", + "SSE.Controllers.DocumentHolder.txtInsertEqBefore": "Insert equation before", + "SSE.Controllers.DocumentHolder.txtLimitChange": "Change limits location", + "SSE.Controllers.DocumentHolder.txtLimitOver": "Limit over text", + "SSE.Controllers.DocumentHolder.txtLimitUnder": "Limit under text", + "SSE.Controllers.DocumentHolder.txtMatchBrackets": "Match brackets to argument height", + "SSE.Controllers.DocumentHolder.txtMatrixAlign": "Matrix alignment", "SSE.Controllers.DocumentHolder.txtOverbar": "Bar over text", - "SSE.Controllers.DocumentHolder.txtUnderbar": "Bar under text", + "SSE.Controllers.DocumentHolder.txtRemFractionBar": "Remove fraction bar", + "SSE.Controllers.DocumentHolder.txtRemLimit": "Remove limit", + "SSE.Controllers.DocumentHolder.txtRemoveAccentChar": "Remove accent character", + "SSE.Controllers.DocumentHolder.txtRemoveBar": "Remove bar", "SSE.Controllers.DocumentHolder.txtRemScripts": "Remove scripts", "SSE.Controllers.DocumentHolder.txtRemSubscript": "Remove subscript", "SSE.Controllers.DocumentHolder.txtRemSuperscript": "Remove superscript", + "SSE.Controllers.DocumentHolder.txtRowHeight": "Row Height", "SSE.Controllers.DocumentHolder.txtScriptsAfter": "Scripts after text", "SSE.Controllers.DocumentHolder.txtScriptsBefore": "Scripts before text", - "SSE.Controllers.DocumentHolder.txtFractionStacked": "Change to stacked fraction", - "SSE.Controllers.DocumentHolder.txtFractionSkewed": "Change to skewed fraction", - "SSE.Controllers.DocumentHolder.txtFractionLinear": "Change to linear fraction", - "SSE.Controllers.DocumentHolder.txtRemFractionBar": "Remove fraction bar", - "SSE.Controllers.DocumentHolder.txtAddFractionBar": "Add fraction bar", - "SSE.Controllers.DocumentHolder.txtRemLimit": "Remove limit", - "SSE.Controllers.DocumentHolder.txtLimitOver": "Limit over text", - "SSE.Controllers.DocumentHolder.txtLimitUnder": "Limit under text", - "SSE.Controllers.DocumentHolder.txtHidePlaceholder": "Hide placeholder", - "SSE.Controllers.DocumentHolder.txtShowPlaceholder": "Show placeholder", - "SSE.Controllers.DocumentHolder.txtMatrixAlign": "Matrix alignment", - "SSE.Controllers.DocumentHolder.txtColumnAlign": "Column alignment", - "SSE.Controllers.DocumentHolder.txtTop": "Top", - "SSE.Controllers.DocumentHolder.txtBottom": "Bottom", - "SSE.Controllers.DocumentHolder.txtInsertEqBefore": "Insert equation before", - "SSE.Controllers.DocumentHolder.txtInsertEqAfter": "Insert equation after", - "SSE.Controllers.DocumentHolder.txtDeleteEq": "Delete equation", - "SSE.Controllers.DocumentHolder.txtLimitChange": "Change limits location", - "SSE.Controllers.DocumentHolder.txtHideTopLimit": "Hide top limit", - "SSE.Controllers.DocumentHolder.txtShowTopLimit": "Show top limit", - "SSE.Controllers.DocumentHolder.txtHideBottomLimit": "Hide bottom limit", "SSE.Controllers.DocumentHolder.txtShowBottomLimit": "Show bottom limit", - "SSE.Controllers.DocumentHolder.txtInsertArgBefore": "Insert argument before", - "SSE.Controllers.DocumentHolder.txtInsertArgAfter": "Insert argument after", - "SSE.Controllers.DocumentHolder.txtDeleteArg": "Delete argument", - "SSE.Controllers.DocumentHolder.txtHideOpenBracket": "Hide opening bracket", - "SSE.Controllers.DocumentHolder.txtShowOpenBracket": "Show opening bracket", - "SSE.Controllers.DocumentHolder.txtHideCloseBracket": "Hide closing bracket", "SSE.Controllers.DocumentHolder.txtShowCloseBracket": "Show closing bracket", - "SSE.Controllers.DocumentHolder.txtStretchBrackets": "Stretch brackets", - "SSE.Controllers.DocumentHolder.txtMatchBrackets": "Match brackets to argument height", - "SSE.Controllers.DocumentHolder.txtGroupCharOver": "Char over text", - "SSE.Controllers.DocumentHolder.txtGroupCharUnder": "Char under text", - "SSE.Controllers.DocumentHolder.txtDeleteGroupChar": "Delete char", - "SSE.Controllers.DocumentHolder.txtHideDegree": "Hide degree", "SSE.Controllers.DocumentHolder.txtShowDegree": "Show degree", - "SSE.Controllers.DocumentHolder.txtIncreaseArg": "Increase argument size", - "SSE.Controllers.DocumentHolder.txtDecreaseArg": "Decrease argument size", - "SSE.Controllers.DocumentHolder.txtInsertBreak": "Insert manual break", - "SSE.Controllers.DocumentHolder.txtDeleteBreak": "Delete manual break", - "SSE.Controllers.DocumentHolder.txtAlignToChar": "Align to character", - "SSE.Controllers.DocumentHolder.txtDeleteRadical": "Delete radical", - "SSE.Controllers.DocumentHolder.txtDeleteChars": "Delete enclosing characters", - "SSE.Controllers.DocumentHolder.txtDeleteCharsAndSeparators": "Delete enclosing characters and separators", + "SSE.Controllers.DocumentHolder.txtShowOpenBracket": "Show opening bracket", + "SSE.Controllers.DocumentHolder.txtShowPlaceholder": "Show placeholder", + "SSE.Controllers.DocumentHolder.txtShowTopLimit": "Show top limit", + "SSE.Controllers.DocumentHolder.txtStretchBrackets": "Stretch brackets", + "SSE.Controllers.DocumentHolder.txtTop": "Top", + "SSE.Controllers.DocumentHolder.txtUnderbar": "Bar under text", + "SSE.Controllers.DocumentHolder.txtWidth": "Width", "SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet", "SSE.Controllers.LeftMenu.textByColumns": "By columns", "SSE.Controllers.LeftMenu.textByRows": "By rows", @@ -199,7 +199,6 @@ "SSE.Controllers.LeftMenu.warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
Are you sure you want to continue?", "SSE.Controllers.Main.confirmMoveCellRange": "The destination cell range can contain data. Continue the operation?", "SSE.Controllers.Main.confirmPutMergeRange": "The source data contained merged cells.
They had been unmerged before they were pasted into the table.", - "del_SSE.Controllers.Main.convertationErrorText": "Conversion failed.", "SSE.Controllers.Main.convertationTimeoutText": "Conversion timeout exceeded.", "SSE.Controllers.Main.criticalErrorExtText": "Press \"OK\" to return to document list.", "SSE.Controllers.Main.criticalErrorTitle": "Error", @@ -215,7 +214,7 @@ "SSE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", "SSE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", - "SSE.Controllers.Main.errorCopyMultiselectArea": "This command cannot be used with multiple selections.
Select a single range and try again.", + "SSE.Controllers.Main.errorCopyMultiselectArea": "This command cannot be used with multiple selections.
Select a single range and try again.", "SSE.Controllers.Main.errorCountArg": "An error in the entered formula.
Incorrect number of arguments is used.", "SSE.Controllers.Main.errorCountArgExceed": "An error in the entered formula.
Number of arguments is exceeded.", "SSE.Controllers.Main.errorCreateDefName": "The existing named ranges cannot be edited and the new ones cannot be created
at the moment as some of them are being edited.", @@ -324,12 +323,10 @@ "SSE.Controllers.Statusbar.warnDeleteSheet": "The worksheet might contain data. Are you sure you want to proceed?", "SSE.Controllers.Statusbar.zoomText": "Zoom {0}%", "SSE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?", - "SSE.Controllers.Toolbar.textCancel": "Cancel", - "SSE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.
Please enter a numeric value between 1 and 409", - "SSE.Controllers.Toolbar.textWarning": "Warning", - "SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?", "SSE.Controllers.Toolbar.textAccent": "Accents", "SSE.Controllers.Toolbar.textBracket": "Brackets", + "SSE.Controllers.Toolbar.textCancel": "Cancel", + "SSE.Controllers.Toolbar.textFontSizeErr": "The entered value is incorrect.
Please enter a numeric value between 1 and 409", "SSE.Controllers.Toolbar.textFraction": "Fractions", "SSE.Controllers.Toolbar.textFunction": "Functions", "SSE.Controllers.Toolbar.textIntegral": "Integrals", @@ -340,6 +337,7 @@ "SSE.Controllers.Toolbar.textRadical": "Radicals", "SSE.Controllers.Toolbar.textScript": "Scripts", "SSE.Controllers.Toolbar.textSymbols": "Symbols", + "SSE.Controllers.Toolbar.textWarning": "Warning", "SSE.Controllers.Toolbar.txtAccent_Accent": "Acute", "SSE.Controllers.Toolbar.txtAccent_ArrowD": "Right-Left Arrow Above", "SSE.Controllers.Toolbar.txtAccent_ArrowL": "Leftwards Arrow Above", @@ -656,6 +654,7 @@ "SSE.Controllers.Toolbar.txtSymbol_vdots": "Vertical Ellipsis", "SSE.Controllers.Toolbar.txtSymbol_xsi": "Xi", "SSE.Controllers.Toolbar.txtSymbol_zeta": "Zeta", + "SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?", "SSE.Views.AutoFilterDialog.btnCustomFilter": "Custom Filter", "SSE.Views.AutoFilterDialog.cancelButtonText": "Cancel", "SSE.Views.AutoFilterDialog.okButtonText": "OK", @@ -712,13 +711,13 @@ "SSE.Views.ChartSettings.textLine": "Line Chart", "SSE.Views.ChartSettings.textPie": "Pie Chart", "SSE.Views.ChartSettings.textPoint": "XY (Scatter) Chart", + "SSE.Views.ChartSettings.textRanges": "Data Range", + "SSE.Views.ChartSettings.textSelectData": "Select Data", "SSE.Views.ChartSettings.textSize": "Size", "SSE.Views.ChartSettings.textStock": "Stock Chart", "SSE.Views.ChartSettings.textStyle": "Style", - "SSE.Views.ChartSettings.textWidth": "Width", "SSE.Views.ChartSettings.textType": "Type", - "SSE.Views.ChartSettings.textSelectData": "Select Data", - "SSE.Views.ChartSettings.textRanges": "Data Range", + "SSE.Views.ChartSettings.textWidth": "Width", "SSE.Views.ChartSettingsDlg.cancelButtonText": "Cancel", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:
opening price, max price, min price, closing price.", @@ -876,6 +875,7 @@ "SSE.Views.DocumentHolder.textArrangeBackward": "Move Backward", "SSE.Views.DocumentHolder.textArrangeForward": "Move Forward", "SSE.Views.DocumentHolder.textArrangeFront": "Bring to Foreground", + "SSE.Views.DocumentHolder.textEntriesList": "Select from drop-down list", "SSE.Views.DocumentHolder.textFreezePanes": "Freeze Panes", "SSE.Views.DocumentHolder.textUnFreezePanes": "Unfreeze Panes", "SSE.Views.DocumentHolder.topCellText": "Align Top", @@ -926,7 +926,6 @@ "SSE.Views.DocumentHolder.txtUngroup": "Ungroup", "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", - "SSE.Views.DocumentHolder.textEntriesList": "Select from drop-down list", "SSE.Views.FileMenu.btnBackCaption": "Go to Documents", "SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu", "SSE.Views.FileMenu.btnCreateNewCaption": "Create New", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index ae3dd4a91..dc0932073 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -108,8 +108,78 @@ "SSE.Controllers.DocumentHolder.textInsertTop": "Добавить сверху", "SSE.Controllers.DocumentHolder.textSym": "симв", "SSE.Controllers.DocumentHolder.tipIsLocked": "Этот элемент редактируется другим пользователем.", + "SSE.Controllers.DocumentHolder.txtAddBottom": "Добавить нижнюю границу", + "SSE.Controllers.DocumentHolder.txtAddFractionBar": "Добавить дробную черту", + "SSE.Controllers.DocumentHolder.txtAddHor": "Добавить горизонтальную линию", + "SSE.Controllers.DocumentHolder.txtAddLB": "Добавить линию из левого нижнего угла", + "SSE.Controllers.DocumentHolder.txtAddLeft": "Добавить левую границу", + "SSE.Controllers.DocumentHolder.txtAddLT": "Добавить линию из левого верхнего угла", + "SSE.Controllers.DocumentHolder.txtAddRight": "Добавить правую границу", + "SSE.Controllers.DocumentHolder.txtAddTop": "Добавить верхнюю границу", + "SSE.Controllers.DocumentHolder.txtAddVer": "Добавить вертикальную линию", + "SSE.Controllers.DocumentHolder.txtAlignToChar": "Выравнивание по символу", + "SSE.Controllers.DocumentHolder.txtBorderProps": "Свойства границ", + "SSE.Controllers.DocumentHolder.txtBottom": "По нижнему краю", + "SSE.Controllers.DocumentHolder.txtColumnAlign": "Выравнивание столбца", + "SSE.Controllers.DocumentHolder.txtDecreaseArg": "Уменьшить размер аргумента", + "SSE.Controllers.DocumentHolder.txtDeleteArg": "Удалить аргумент", + "SSE.Controllers.DocumentHolder.txtDeleteBreak": "Удалить принудительный разрыв", + "SSE.Controllers.DocumentHolder.txtDeleteChars": "Удалить вложенные знаки", + "SSE.Controllers.DocumentHolder.txtDeleteCharsAndSeparators": "Удалить вложенные знаки и разделители", + "SSE.Controllers.DocumentHolder.txtDeleteEq": "Удалить формулу", + "SSE.Controllers.DocumentHolder.txtDeleteGroupChar": "Удалить символ", + "SSE.Controllers.DocumentHolder.txtDeleteRadical": "Удалить радикал", + "SSE.Controllers.DocumentHolder.txtFractionLinear": "Изменить на горизонтальную простую дробь", + "SSE.Controllers.DocumentHolder.txtFractionSkewed": "Изменить на диагональную простую дробь", + "SSE.Controllers.DocumentHolder.txtFractionStacked": "Изменить на вертикальную простую дробь", + "SSE.Controllers.DocumentHolder.txtGroupCharOver": "Символ над текстом", + "SSE.Controllers.DocumentHolder.txtGroupCharUnder": "Символ под текстом", "SSE.Controllers.DocumentHolder.txtHeight": "Высота", + "SSE.Controllers.DocumentHolder.txtHideBottom": "Скрыть нижнюю границу", + "SSE.Controllers.DocumentHolder.txtHideBottomLimit": "Скрыть нижний предел", + "SSE.Controllers.DocumentHolder.txtHideCloseBracket": "Скрыть закрывающую скобку", + "SSE.Controllers.DocumentHolder.txtHideDegree": "Скрыть степень", + "SSE.Controllers.DocumentHolder.txtHideHor": "Скрыть горизонтальную линию", + "SSE.Controllers.DocumentHolder.txtHideLB": "Скрыть линию из левого нижнего угла", + "SSE.Controllers.DocumentHolder.txtHideLeft": "Скрыть левую границу", + "SSE.Controllers.DocumentHolder.txtHideLT": "Скрыть линию из левого верхнего угла", + "SSE.Controllers.DocumentHolder.txtHideOpenBracket": "Скрыть открывающую скобку", + "SSE.Controllers.DocumentHolder.txtHidePlaceholder": "Скрыть поля для заполнения", + "SSE.Controllers.DocumentHolder.txtHideRight": "Скрыть правую границу", + "SSE.Controllers.DocumentHolder.txtHideTop": "Скрыть верхнюю границу", + "SSE.Controllers.DocumentHolder.txtHideTopLimit": "Скрыть верхний предел", + "SSE.Controllers.DocumentHolder.txtHideVer": "Скрыть вертикальную линию", + "SSE.Controllers.DocumentHolder.txtIncreaseArg": "Увеличить размер аргумента", + "SSE.Controllers.DocumentHolder.txtInsertArgAfter": "Вставить аргумент после", + "SSE.Controllers.DocumentHolder.txtInsertArgBefore": "Вставить аргумент перед", + "SSE.Controllers.DocumentHolder.txtInsertBreak": "Вставить принудительный разрыв", + "SSE.Controllers.DocumentHolder.txtInsertEqAfter": "Вставить формулу после", + "SSE.Controllers.DocumentHolder.txtInsertEqBefore": "Вставить формулу перед", + "SSE.Controllers.DocumentHolder.txtLimitChange": "Изменить положение пределов", + "SSE.Controllers.DocumentHolder.txtLimitOver": "Предел над текстом", + "SSE.Controllers.DocumentHolder.txtLimitUnder": "Предел под текстом", + "SSE.Controllers.DocumentHolder.txtMatchBrackets": "Изменить размер скобок в соответствии с высотой аргумента", + "SSE.Controllers.DocumentHolder.txtMatrixAlign": "Выравнивание матрицы", + "SSE.Controllers.DocumentHolder.txtOverbar": "Черта над текстом", + "SSE.Controllers.DocumentHolder.txtRemFractionBar": "Удалить дробную черту", + "SSE.Controllers.DocumentHolder.txtRemLimit": "Удалить предел", + "SSE.Controllers.DocumentHolder.txtRemoveAccentChar": "Удалить диакритический знак", + "SSE.Controllers.DocumentHolder.txtRemoveBar": "Удалить черту", + "SSE.Controllers.DocumentHolder.txtRemScripts": "Удалить индексы", + "SSE.Controllers.DocumentHolder.txtRemSubscript": "Удалить нижний индекс", + "SSE.Controllers.DocumentHolder.txtRemSuperscript": "Удалить верхний индекс", "SSE.Controllers.DocumentHolder.txtRowHeight": "Высота строки", + "SSE.Controllers.DocumentHolder.txtScriptsAfter": "Индексы после текста", + "SSE.Controllers.DocumentHolder.txtScriptsBefore": "Индексы перед текстом", + "SSE.Controllers.DocumentHolder.txtShowBottomLimit": "Показать нижний предел", + "SSE.Controllers.DocumentHolder.txtShowCloseBracket": "Показать закрывающую скобку", + "SSE.Controllers.DocumentHolder.txtShowDegree": "Показать степень", + "SSE.Controllers.DocumentHolder.txtShowOpenBracket": "Показать открывающую скобку", + "SSE.Controllers.DocumentHolder.txtShowPlaceholder": "Показать поля для заполнения", + "SSE.Controllers.DocumentHolder.txtShowTopLimit": "Показать верхний предел", + "SSE.Controllers.DocumentHolder.txtStretchBrackets": "Растянуть скобки", + "SSE.Controllers.DocumentHolder.txtTop": "По верхнему краю", + "SSE.Controllers.DocumentHolder.txtUnderbar": "Черта под текстом", "SSE.Controllers.DocumentHolder.txtWidth": "Ширина", "SSE.Controllers.LeftMenu.newDocumentTitle": "Электронная таблица без имени", "SSE.Controllers.LeftMenu.textByColumns": "По столбцам", @@ -144,6 +214,7 @@ "SSE.Controllers.Main.errorBadImageUrl": "Неправильный URL-адрес изображения", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Потеряно соединение с сервером. В данный момент нельзя отредактировать документ.", "SSE.Controllers.Main.errorConnectToServer": "Не удается сохранить документ. Проверьте параметры подключения или обратитесь к вашему администратору.
Когда вы нажмете на кнопку 'OK', вам будет предложено скачать документ.

Дополнительную информацию о подключении Сервера документов можно найти здесь", + "SSE.Controllers.Main.errorCopyMultiselectArea": "Данная команда неприменима для несвязных диапазонов.
Выберите один диапазон и повторите попытку.", "SSE.Controllers.Main.errorCountArg": "Ошибка во введенной формуле.
Использовано неверное количество аргументов.", "SSE.Controllers.Main.errorCountArgExceed": "Ошибка во введенной формуле.
Превышено количество аргументов.", "SSE.Controllers.Main.errorCreateDefName": "В настоящий момент нельзя отредактировать существующие именованные диапазоны и создать новые,
так как некоторые из них редактируются.", @@ -252,9 +323,337 @@ "SSE.Controllers.Statusbar.warnDeleteSheet": "Рабочий лист может содержать данные. Вы действительно хотите продолжить?", "SSE.Controllers.Statusbar.zoomText": "Масштаб {0}%", "SSE.Controllers.Toolbar.confirmAddFontName": "Шрифт, который вы собираетесь сохранить, недоступен на этом устройстве.
Стиль текста будет отображаться с использованием одного из системных шрифтов; сохраненный шрифт будет использоваться, когда он будет доступен.
Вы хотите продолжить?", + "SSE.Controllers.Toolbar.textAccent": "Диакритические знаки", + "SSE.Controllers.Toolbar.textBracket": "Скобки", "SSE.Controllers.Toolbar.textCancel": "Отмена", "SSE.Controllers.Toolbar.textFontSizeErr": "Введенное значение некорректно.
Введите числовое значение от 1 до 409", + "SSE.Controllers.Toolbar.textFraction": "Дроби", + "SSE.Controllers.Toolbar.textFunction": "Функции", + "SSE.Controllers.Toolbar.textIntegral": "Интегралы", + "SSE.Controllers.Toolbar.textLargeOperator": "Крупные операторы", + "SSE.Controllers.Toolbar.textLimitAndLog": "Пределы и логарифмы", + "SSE.Controllers.Toolbar.textMatrix": "Матрицы", + "SSE.Controllers.Toolbar.textOperator": "Операторы", + "SSE.Controllers.Toolbar.textRadical": "Радикалы", + "SSE.Controllers.Toolbar.textScript": "Индексы", + "SSE.Controllers.Toolbar.textSymbols": "Символы", "SSE.Controllers.Toolbar.textWarning": "Предупреждение", + "SSE.Controllers.Toolbar.txtAccent_Accent": "Ударение", + "SSE.Controllers.Toolbar.txtAccent_ArrowD": "Стрелка вправо-влево сверху", + "SSE.Controllers.Toolbar.txtAccent_ArrowL": "Стрелка влево сверху", + "SSE.Controllers.Toolbar.txtAccent_ArrowR": "Стрелка вправо сверху", + "SSE.Controllers.Toolbar.txtAccent_Bar": "Черта", + "SSE.Controllers.Toolbar.txtAccent_BarBot": "Черта снизу", + "SSE.Controllers.Toolbar.txtAccent_BarTop": "Черта сверху", + "SSE.Controllers.Toolbar.txtAccent_BorderBox": "Формула в рамке (с заполнителем)", + "SSE.Controllers.Toolbar.txtAccent_BorderBoxCustom": "Формула в рамке (пример)", + "SSE.Controllers.Toolbar.txtAccent_Check": "Галочка", + "SSE.Controllers.Toolbar.txtAccent_CurveBracketBot": "Фигурная скобка снизу", + "SSE.Controllers.Toolbar.txtAccent_CurveBracketTop": "Фигурная скобка сверху", + "SSE.Controllers.Toolbar.txtAccent_Custom_1": "Вектор A", + "SSE.Controllers.Toolbar.txtAccent_Custom_2": "ABC с чертой сверху", + "SSE.Controllers.Toolbar.txtAccent_Custom_3": "x XOR y с чертой сверху", + "SSE.Controllers.Toolbar.txtAccent_DDDot": "Три точки", + "SSE.Controllers.Toolbar.txtAccent_DDot": "Две точки", + "SSE.Controllers.Toolbar.txtAccent_Dot": "Точка", + "SSE.Controllers.Toolbar.txtAccent_DoubleBar": "Двойная черта сверху", + "SSE.Controllers.Toolbar.txtAccent_Grave": "Тупое ударение", + "SSE.Controllers.Toolbar.txtAccent_GroupBot": "Группирующий знак снизу", + "SSE.Controllers.Toolbar.txtAccent_GroupTop": "Группирующий знак сверху", + "SSE.Controllers.Toolbar.txtAccent_HarpoonL": "Гарпун влево сверху", + "SSE.Controllers.Toolbar.txtAccent_HarpoonR": "Гарпун вправо сверху", + "SSE.Controllers.Toolbar.txtAccent_Hat": "Крышка", + "SSE.Controllers.Toolbar.txtAccent_Smile": "Значок краткости", + "SSE.Controllers.Toolbar.txtAccent_Tilde": "Тильда", + "SSE.Controllers.Toolbar.txtBracket_Angle": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_Angle_Delimiter_2": "Скобки и разделители", + "SSE.Controllers.Toolbar.txtBracket_Angle_Delimiter_3": "Скобки и разделители", + "SSE.Controllers.Toolbar.txtBracket_Angle_NoneOpen": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_Angle_OpenNone": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_Curve": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_Curve_Delimiter_2": "Скобки и разделители", + "SSE.Controllers.Toolbar.txtBracket_Curve_NoneOpen": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_Curve_OpenNone": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_Custom_1": "Наборы условий (два условия)", + "SSE.Controllers.Toolbar.txtBracket_Custom_2": "Наборы условий (три условия)", + "SSE.Controllers.Toolbar.txtBracket_Custom_3": "Стопка объектов", + "SSE.Controllers.Toolbar.txtBracket_Custom_4": "Стопка объектов", + "SSE.Controllers.Toolbar.txtBracket_Custom_5": "Наборы условий (пример)", + "SSE.Controllers.Toolbar.txtBracket_Custom_6": "Биномиальный коэффициент", + "SSE.Controllers.Toolbar.txtBracket_Custom_7": "Биномиальный коэффициент", + "SSE.Controllers.Toolbar.txtBracket_Line": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_Line_NoneOpen": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_Line_OpenNone": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_LineDouble": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_LineDouble_NoneOpen": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_LineDouble_OpenNone": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_LowLim": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_LowLim_NoneNone": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_LowLim_OpenNone": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_Round": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_Round_Delimiter_2": "Скобки и разделители", + "SSE.Controllers.Toolbar.txtBracket_Round_NoneOpen": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_Round_OpenNone": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_Square": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_Square_CloseClose": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_Square_CloseOpen": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_Square_NoneOpen": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_Square_OpenNone": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_Square_OpenOpen": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_SquareDouble": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_SquareDouble_NoneOpen": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_SquareDouble_OpenNone": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_UppLim": "Скобки", + "SSE.Controllers.Toolbar.txtBracket_UppLim_NoneOpen": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtBracket_UppLim_OpenNone": "Отдельная скобка", + "SSE.Controllers.Toolbar.txtFractionDiagonal": "Диагональная простая дробь", + "SSE.Controllers.Toolbar.txtFractionDifferential_1": "Дифференциал", + "SSE.Controllers.Toolbar.txtFractionDifferential_2": "Дифференциал", + "SSE.Controllers.Toolbar.txtFractionDifferential_3": "Дифференциал", + "SSE.Controllers.Toolbar.txtFractionDifferential_4": "Дифференциал", + "SSE.Controllers.Toolbar.txtFractionHorizontal": "Горизонтальная простая дробь", + "SSE.Controllers.Toolbar.txtFractionPi_2": "Пи разделить на два", + "SSE.Controllers.Toolbar.txtFractionSmall": "Маленькая простая дробь", + "SSE.Controllers.Toolbar.txtFractionVertical": "Вертикальная простая дробь", + "SSE.Controllers.Toolbar.txtFunction_1_Cos": "Арккосинус", + "SSE.Controllers.Toolbar.txtFunction_1_Cosh": "Гиперболический арккосинус", + "SSE.Controllers.Toolbar.txtFunction_1_Cot": "Арккотангенс", + "SSE.Controllers.Toolbar.txtFunction_1_Coth": "Гиперболический арккотангенс", + "SSE.Controllers.Toolbar.txtFunction_1_Csc": "Арккосеканс", + "SSE.Controllers.Toolbar.txtFunction_1_Csch": "Гиперболический арккосеканс", + "SSE.Controllers.Toolbar.txtFunction_1_Sec": "Арксеканс", + "SSE.Controllers.Toolbar.txtFunction_1_Sech": "Гиперболический арксеканс", + "SSE.Controllers.Toolbar.txtFunction_1_Sin": "Арксинус", + "SSE.Controllers.Toolbar.txtFunction_1_Sinh": "Гиперболический арксинус", + "SSE.Controllers.Toolbar.txtFunction_1_Tan": "Арктангенс", + "SSE.Controllers.Toolbar.txtFunction_1_Tanh": "Гиперболический арктангенс", + "SSE.Controllers.Toolbar.txtFunction_Cos": "Косинус", + "SSE.Controllers.Toolbar.txtFunction_Cosh": "Гиперболический косинус", + "SSE.Controllers.Toolbar.txtFunction_Cot": "Котангенс", + "SSE.Controllers.Toolbar.txtFunction_Coth": "Гиперболический котангенс", + "SSE.Controllers.Toolbar.txtFunction_Csc": "Косеканс", + "SSE.Controllers.Toolbar.txtFunction_Csch": "Гиперболический косеканс", + "SSE.Controllers.Toolbar.txtFunction_Custom_1": "Sin θ", + "SSE.Controllers.Toolbar.txtFunction_Custom_2": "Cos 2x", + "SSE.Controllers.Toolbar.txtFunction_Custom_3": "Формула тангенса", + "SSE.Controllers.Toolbar.txtFunction_Sec": "Секанс", + "SSE.Controllers.Toolbar.txtFunction_Sech": "Гиперболический секанс", + "SSE.Controllers.Toolbar.txtFunction_Sin": "Синус", + "SSE.Controllers.Toolbar.txtFunction_Sinh": "Гиперболический синус", + "SSE.Controllers.Toolbar.txtFunction_Tan": "Тангенс", + "SSE.Controllers.Toolbar.txtFunction_Tanh": "Гиперболический тангенс", + "SSE.Controllers.Toolbar.txtIntegral": "Интеграл", + "SSE.Controllers.Toolbar.txtIntegral_dtheta": "Дифференциал dθ", + "SSE.Controllers.Toolbar.txtIntegral_dx": "Дифференциал dx", + "SSE.Controllers.Toolbar.txtIntegral_dy": "Дифференциал dy", + "SSE.Controllers.Toolbar.txtIntegralCenterSubSup": "Интеграл", + "SSE.Controllers.Toolbar.txtIntegralDouble": "Двойной интеграл", + "SSE.Controllers.Toolbar.txtIntegralDoubleCenterSubSup": "Двойной интеграл", + "SSE.Controllers.Toolbar.txtIntegralDoubleSubSup": "Двойной интеграл", + "SSE.Controllers.Toolbar.txtIntegralOriented": "Контурный интеграл", + "SSE.Controllers.Toolbar.txtIntegralOrientedCenterSubSup": "Контурный интеграл", + "SSE.Controllers.Toolbar.txtIntegralOrientedDouble": "Интеграл по поверхности", + "SSE.Controllers.Toolbar.txtIntegralOrientedDoubleCenterSubSup": "Интеграл по поверхности", + "SSE.Controllers.Toolbar.txtIntegralOrientedDoubleSubSup": "Интеграл по поверхности", + "SSE.Controllers.Toolbar.txtIntegralOrientedSubSup": "Контурный интеграл", + "SSE.Controllers.Toolbar.txtIntegralOrientedTriple": "Интеграл по объему", + "SSE.Controllers.Toolbar.txtIntegralOrientedTripleCenterSubSup": "Интеграл по объему", + "SSE.Controllers.Toolbar.txtIntegralOrientedTripleSubSup": "Интеграл по объему", + "SSE.Controllers.Toolbar.txtIntegralSubSup": "Интеграл", + "SSE.Controllers.Toolbar.txtIntegralTriple": "Тройной интеграл", + "SSE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Тройной интеграл", + "SSE.Controllers.Toolbar.txtIntegralTripleSubSup": "Тройной интеграл", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Клин", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Клин", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Клин", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Клин", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Клин", + "SSE.Controllers.Toolbar.txtLargeOperator_CoProd": "Сопроизведение", + "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Сопроизведение", + "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Сопроизведение", + "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Сопроизведение", + "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Сопроизведение", + "SSE.Controllers.Toolbar.txtLargeOperator_Custom_1": "Сумма", + "SSE.Controllers.Toolbar.txtLargeOperator_Custom_2": "Сумма", + "SSE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Сумма", + "SSE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Произведение", + "SSE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Объединение", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Буква V", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Буква V", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Буква V", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Буква V", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Буква V", + "SSE.Controllers.Toolbar.txtLargeOperator_Intersection": "Пересечение", + "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSub": "Пересечение", + "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSubSup": "Пересечение", + "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_Sub": "Пересечение", + "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_SubSup": "Пересечение", + "SSE.Controllers.Toolbar.txtLargeOperator_Prod": "Произведение", + "SSE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSub": "Произведение", + "SSE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSubSup": "Произведение", + "SSE.Controllers.Toolbar.txtLargeOperator_Prod_Sub": "Произведение", + "SSE.Controllers.Toolbar.txtLargeOperator_Prod_SubSup": "Произведение", + "SSE.Controllers.Toolbar.txtLargeOperator_Sum": "Сумма", + "SSE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSub": "Сумма", + "SSE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSubSup": "Сумма", + "SSE.Controllers.Toolbar.txtLargeOperator_Sum_Sub": "Сумма", + "SSE.Controllers.Toolbar.txtLargeOperator_Sum_SubSup": "Сумма", + "SSE.Controllers.Toolbar.txtLargeOperator_Union": "Объединение", + "SSE.Controllers.Toolbar.txtLargeOperator_Union_CenterSub": "Объединение", + "SSE.Controllers.Toolbar.txtLargeOperator_Union_CenterSubSup": "Объединение", + "SSE.Controllers.Toolbar.txtLargeOperator_Union_Sub": "Объединение", + "SSE.Controllers.Toolbar.txtLargeOperator_Union_SubSup": "Объединение", + "SSE.Controllers.Toolbar.txtLimitLog_Custom_1": "Пример предела", + "SSE.Controllers.Toolbar.txtLimitLog_Custom_2": "Пример максимума", + "SSE.Controllers.Toolbar.txtLimitLog_Lim": "Предел", + "SSE.Controllers.Toolbar.txtLimitLog_Ln": "Натуральный логарифм", + "SSE.Controllers.Toolbar.txtLimitLog_Log": "Логарифм", + "SSE.Controllers.Toolbar.txtLimitLog_LogBase": "Логарифм", + "SSE.Controllers.Toolbar.txtLimitLog_Max": "Максимум", + "SSE.Controllers.Toolbar.txtLimitLog_Min": "Минимум", + "SSE.Controllers.Toolbar.txtMatrix_1_2": "Пустая матрица 1 x 2", + "SSE.Controllers.Toolbar.txtMatrix_1_3": "Пустая матрица 1 x 3", + "SSE.Controllers.Toolbar.txtMatrix_2_1": "Пустая матрица 2 x 1", + "SSE.Controllers.Toolbar.txtMatrix_2_2": "Пустая матрица 2 x 2", + "SSE.Controllers.Toolbar.txtMatrix_2_2_DLineBracket": "Пустая матрица со скобками", + "SSE.Controllers.Toolbar.txtMatrix_2_2_LineBracket": "Пустая матрица со скобками", + "SSE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Пустая матрица со скобками", + "SSE.Controllers.Toolbar.txtMatrix_2_2_SquareBracket": "Пустая матрица со скобками", + "SSE.Controllers.Toolbar.txtMatrix_2_3": "Пустая матрица 2 x 3", + "SSE.Controllers.Toolbar.txtMatrix_3_1": "Пустая матрица 3 x 1", + "SSE.Controllers.Toolbar.txtMatrix_3_2": "Пустая матрица 3 x 2", + "SSE.Controllers.Toolbar.txtMatrix_3_3": "Пустая матрица 3 x 3", + "SSE.Controllers.Toolbar.txtMatrix_Dots_Baseline": "Точки на опорной линии", + "SSE.Controllers.Toolbar.txtMatrix_Dots_Center": "Точки посередине", + "SSE.Controllers.Toolbar.txtMatrix_Dots_Diagonal": "Точки по диагонали", + "SSE.Controllers.Toolbar.txtMatrix_Dots_Vertical": "Точки по вертикали", + "SSE.Controllers.Toolbar.txtMatrix_Flat_Round": "Разреженная матрица", + "SSE.Controllers.Toolbar.txtMatrix_Flat_Square": "Разреженная матрица", + "SSE.Controllers.Toolbar.txtMatrix_Identity_2": "Единичная матрица 2 x 2", + "SSE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "Единичная матрица 3 x 3", + "SSE.Controllers.Toolbar.txtMatrix_Identity_3": "Единичная матрица 3 x 3", + "SSE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "Единичная матрица 3 x 3", + "SSE.Controllers.Toolbar.txtOperator_ArrowD_Bot": "Стрелка вправо-влево снизу", + "SSE.Controllers.Toolbar.txtOperator_ArrowD_Top": "Стрелка вправо-влево сверху", + "SSE.Controllers.Toolbar.txtOperator_ArrowL_Bot": "Стрелка влево снизу", + "SSE.Controllers.Toolbar.txtOperator_ArrowL_Top": "Стрелка влево сверху", + "SSE.Controllers.Toolbar.txtOperator_ArrowR_Bot": "Стрелка вправо снизу", + "SSE.Controllers.Toolbar.txtOperator_ArrowR_Top": "Стрелка вправо сверху", + "SSE.Controllers.Toolbar.txtOperator_ColonEquals": "Двоеточие равно", + "SSE.Controllers.Toolbar.txtOperator_Custom_1": "Выход", + "SSE.Controllers.Toolbar.txtOperator_Custom_2": "Дельта выхода", + "SSE.Controllers.Toolbar.txtOperator_Definition": "Равно по определению", + "SSE.Controllers.Toolbar.txtOperator_DeltaEquals": "Дельта равна", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowD_Bot": "Стрелка вправо-влево снизу", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowD_Top": "Стрелка вправо-влево сверху", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowL_Bot": "Стрелка влево снизу", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowL_Top": "Стрелка влево сверху", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowR_Bot": "Стрелка вправо снизу", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowR_Top": "Стрелка вправо сверху", + "SSE.Controllers.Toolbar.txtOperator_EqualsEquals": "Равно равно", + "SSE.Controllers.Toolbar.txtOperator_MinusEquals": "Минус равно", + "SSE.Controllers.Toolbar.txtOperator_PlusEquals": "Плюс равно", + "SSE.Controllers.Toolbar.txtOperator_UnitOfMeasure": "Единица измерения", + "SSE.Controllers.Toolbar.txtRadicalCustom_1": "Радикал", + "SSE.Controllers.Toolbar.txtRadicalCustom_2": "Радикал", + "SSE.Controllers.Toolbar.txtRadicalRoot_2": "Квадратный корень со степенью", + "SSE.Controllers.Toolbar.txtRadicalRoot_3": "Кубический корень", + "SSE.Controllers.Toolbar.txtRadicalRoot_n": "Радикал со степенью", + "SSE.Controllers.Toolbar.txtRadicalSqrt": "Квадратный корень", + "SSE.Controllers.Toolbar.txtScriptCustom_1": "Индекс", + "SSE.Controllers.Toolbar.txtScriptCustom_2": "Индекс", + "SSE.Controllers.Toolbar.txtScriptCustom_3": "Индекс", + "SSE.Controllers.Toolbar.txtScriptCustom_4": "Индекс", + "SSE.Controllers.Toolbar.txtScriptSub": "Нижний индекс", + "SSE.Controllers.Toolbar.txtScriptSubSup": "Нижний и верхний индексы", + "SSE.Controllers.Toolbar.txtScriptSubSupLeft": "Нижний и верхний индексы слева", + "SSE.Controllers.Toolbar.txtScriptSup": "Верхний индекс", + "SSE.Controllers.Toolbar.txtSymbol_about": "Приблизительно", + "SSE.Controllers.Toolbar.txtSymbol_additional": "Дополнение", + "SSE.Controllers.Toolbar.txtSymbol_aleph": "Алеф", + "SSE.Controllers.Toolbar.txtSymbol_alpha": "Альфа", + "SSE.Controllers.Toolbar.txtSymbol_approx": "Почти равно", + "SSE.Controllers.Toolbar.txtSymbol_ast": "Оператор-звездочка", + "SSE.Controllers.Toolbar.txtSymbol_beta": "Бета", + "SSE.Controllers.Toolbar.txtSymbol_beth": "Бет", + "SSE.Controllers.Toolbar.txtSymbol_bullet": "Оператор-маркер", + "SSE.Controllers.Toolbar.txtSymbol_cap": "Пересечение", + "SSE.Controllers.Toolbar.txtSymbol_cbrt": "Кубический корень", + "SSE.Controllers.Toolbar.txtSymbol_cdots": "Горизонтальное многоточие посередине", + "SSE.Controllers.Toolbar.txtSymbol_celsius": "Градусы Цельсия", + "SSE.Controllers.Toolbar.txtSymbol_chi": "Хи", + "SSE.Controllers.Toolbar.txtSymbol_cong": "Приблизительно равно", + "SSE.Controllers.Toolbar.txtSymbol_cup": "Объединение", + "SSE.Controllers.Toolbar.txtSymbol_ddots": "Диагональное многоточие вниз вправо", + "SSE.Controllers.Toolbar.txtSymbol_degree": "Градусы", + "SSE.Controllers.Toolbar.txtSymbol_delta": "Дельта", + "SSE.Controllers.Toolbar.txtSymbol_div": "Знак деления", + "SSE.Controllers.Toolbar.txtSymbol_downarrow": "Стрелка вниз", + "SSE.Controllers.Toolbar.txtSymbol_emptyset": "Пустое множество", + "SSE.Controllers.Toolbar.txtSymbol_epsilon": "Эпсилон", + "SSE.Controllers.Toolbar.txtSymbol_equals": "Равно", + "SSE.Controllers.Toolbar.txtSymbol_equiv": "Тождественно", + "SSE.Controllers.Toolbar.txtSymbol_eta": "Эта", + "SSE.Controllers.Toolbar.txtSymbol_exists": "Существует", + "SSE.Controllers.Toolbar.txtSymbol_factorial": "Факториал", + "SSE.Controllers.Toolbar.txtSymbol_fahrenheit": "Градусы Фаренгейта", + "SSE.Controllers.Toolbar.txtSymbol_forall": "Для всех", + "SSE.Controllers.Toolbar.txtSymbol_gamma": "Гамма", + "SSE.Controllers.Toolbar.txtSymbol_geq": "Больше или равно", + "SSE.Controllers.Toolbar.txtSymbol_gg": "Много больше", + "SSE.Controllers.Toolbar.txtSymbol_greater": "Больше", + "SSE.Controllers.Toolbar.txtSymbol_in": "Является элементом", + "SSE.Controllers.Toolbar.txtSymbol_inc": "Приращение", + "SSE.Controllers.Toolbar.txtSymbol_infinity": "Бесконечность", + "SSE.Controllers.Toolbar.txtSymbol_iota": "Йота", + "SSE.Controllers.Toolbar.txtSymbol_kappa": "Каппа", + "SSE.Controllers.Toolbar.txtSymbol_lambda": "Лямбда", + "SSE.Controllers.Toolbar.txtSymbol_leftarrow": "Стрелка влево", + "SSE.Controllers.Toolbar.txtSymbol_leftrightarrow": "Стрелка влево и вправо", + "SSE.Controllers.Toolbar.txtSymbol_leq": "Меньше или равно", + "SSE.Controllers.Toolbar.txtSymbol_less": "Меньше", + "SSE.Controllers.Toolbar.txtSymbol_ll": "Много меньше", + "SSE.Controllers.Toolbar.txtSymbol_minus": "Минус", + "SSE.Controllers.Toolbar.txtSymbol_mp": "Минус и плюс", + "SSE.Controllers.Toolbar.txtSymbol_mu": "Мю", + "SSE.Controllers.Toolbar.txtSymbol_nabla": "Набла", + "SSE.Controllers.Toolbar.txtSymbol_neq": "Не равно", + "SSE.Controllers.Toolbar.txtSymbol_ni": "Содержит как член", + "SSE.Controllers.Toolbar.txtSymbol_not": "Знак отрицания", + "SSE.Controllers.Toolbar.txtSymbol_notexists": "Не существует", + "SSE.Controllers.Toolbar.txtSymbol_nu": "Ню", + "SSE.Controllers.Toolbar.txtSymbol_o": "Омикрон", + "SSE.Controllers.Toolbar.txtSymbol_omega": "Омега", + "SSE.Controllers.Toolbar.txtSymbol_partial": "Частный дифференциал", + "SSE.Controllers.Toolbar.txtSymbol_percent": "Процент", + "SSE.Controllers.Toolbar.txtSymbol_phi": "Фи", + "SSE.Controllers.Toolbar.txtSymbol_pi": "Пи", + "SSE.Controllers.Toolbar.txtSymbol_plus": "Плюс", + "SSE.Controllers.Toolbar.txtSymbol_pm": "Плюс и минус", + "SSE.Controllers.Toolbar.txtSymbol_propto": "Пропорционально", + "SSE.Controllers.Toolbar.txtSymbol_psi": "Пси", + "SSE.Controllers.Toolbar.txtSymbol_qdrt": "Корень четвертой степени", + "SSE.Controllers.Toolbar.txtSymbol_qed": "Что и требовалось доказать", + "SSE.Controllers.Toolbar.txtSymbol_rddots": "Диагональное многоточие вверх вправо", + "SSE.Controllers.Toolbar.txtSymbol_rho": "Ро", + "SSE.Controllers.Toolbar.txtSymbol_rightarrow": "Стрелка вправо", + "SSE.Controllers.Toolbar.txtSymbol_sigma": "Сигма", + "SSE.Controllers.Toolbar.txtSymbol_sqrt": "Знак радикала", + "SSE.Controllers.Toolbar.txtSymbol_tau": "Тау", + "SSE.Controllers.Toolbar.txtSymbol_therefore": "Следовательно", + "SSE.Controllers.Toolbar.txtSymbol_theta": "Тета", + "SSE.Controllers.Toolbar.txtSymbol_times": "Знак умножения", + "SSE.Controllers.Toolbar.txtSymbol_uparrow": "Стрелка вверх", + "SSE.Controllers.Toolbar.txtSymbol_upsilon": "Ипсилон", + "SSE.Controllers.Toolbar.txtSymbol_varepsilon": "Эпсилон (вариант)", + "SSE.Controllers.Toolbar.txtSymbol_varphi": "Фи (вариант)", + "SSE.Controllers.Toolbar.txtSymbol_varpi": "Пи (вариант)", + "SSE.Controllers.Toolbar.txtSymbol_varrho": "Ро (вариант)", + "SSE.Controllers.Toolbar.txtSymbol_varsigma": "Сигма (вариант)", + "SSE.Controllers.Toolbar.txtSymbol_vartheta": "Тета (вариант)", + "SSE.Controllers.Toolbar.txtSymbol_vdots": "Вертикальное многоточие", + "SSE.Controllers.Toolbar.txtSymbol_xsi": "Кси", + "SSE.Controllers.Toolbar.txtSymbol_zeta": "Дзета", "SSE.Controllers.Toolbar.warnMergeLostData": "В объединенной ячейке останутся только данные из левой верхней ячейки.
Вы действительно хотите продолжить?", "SSE.Views.AutoFilterDialog.btnCustomFilter": "Пользовательский", "SSE.Views.AutoFilterDialog.cancelButtonText": "Отмена", @@ -476,6 +875,7 @@ "SSE.Views.DocumentHolder.textArrangeBackward": "Перенести назад", "SSE.Views.DocumentHolder.textArrangeForward": "Перенести вперед", "SSE.Views.DocumentHolder.textArrangeFront": "Вынести на передний план", + "SSE.Views.DocumentHolder.textEntriesList": "Выбрать из списка", "SSE.Views.DocumentHolder.textFreezePanes": "Закрепить области", "SSE.Views.DocumentHolder.textUnFreezePanes": "Снять закрепление областей", "SSE.Views.DocumentHolder.topCellText": "По верхнему краю", @@ -1064,6 +1464,7 @@ "SSE.Views.Toolbar.tipIncDecimal": "Увеличить разрядность", "SSE.Views.Toolbar.tipIncFont": "Увеличить размер шрифта", "SSE.Views.Toolbar.tipInsertChart": "Вставить диаграмму", + "SSE.Views.Toolbar.tipInsertEquation": "Вставить формулу", "SSE.Views.Toolbar.tipInsertHyperlink": "Добавить гиперссылку", "SSE.Views.Toolbar.tipInsertImage": "Вставить изображение", "SSE.Views.Toolbar.tipInsertOpt": "Вставить ячейки", From cf53fc04a15dbd47833f8d1a238e24d39010d35c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 26 Oct 2016 16:20:51 +0300 Subject: [PATCH 06/36] [PE][SSE] Debug context menu for equations. --- .../main/app/view/DocumentHolder.js | 7 +++++-- apps/presentationeditor/main/locale/en.json | 4 ++++ .../main/app/controller/DocumentHolder.js | 15 +++++++++++++-- apps/spreadsheeteditor/main/locale/en.json | 12 ++++++++++++ 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 9e2c73086..383ccb65d 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2811,8 +2811,11 @@ define([ txtAlignToChar: 'Align to character', txtDeleteRadical: 'Delete radical', txtDeleteChars: 'Delete enclosing characters', - txtDeleteCharsAndSeparators: 'Delete enclosing characters and separators' - + txtDeleteCharsAndSeparators: 'Delete enclosing characters and separators', + alignmentText: 'Alignment', + leftText: 'Left', + rightText: 'Right', + centerText: 'Center' }, PE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index d7c7b3516..ff29465f0 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -728,6 +728,10 @@ "PE.Views.DocumentHolder.txtUnderbar": "Bar under text", "PE.Views.DocumentHolder.txtUngroup": "Ungroup", "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "PE.Views.DocumentHolder.alignmentText": "Alignment", + "PE.Views.DocumentHolder.leftText": "Left", + "PE.Views.DocumentHolder.rightText": "Right", + "PE.Views.DocumentHolder.centerText": "Center", "PE.Views.DocumentPreview.goToSlideText": "Go to Slide", "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}", "PE.Views.DocumentPreview.txtClose": "Close Slideshow", diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index fb964e18f..e964e4b13 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -2269,8 +2269,19 @@ define([ txtAlignToChar: 'Align to character', txtDeleteRadical: 'Delete radical', txtDeleteChars: 'Delete enclosing characters', - txtDeleteCharsAndSeparators: 'Delete enclosing characters and separators' - + txtDeleteCharsAndSeparators: 'Delete enclosing characters and separators', + insertText: 'Insert', + alignmentText: 'Alignment', + leftText: 'Left', + rightText: 'Right', + centerText: 'Center', + insertRowAboveText : 'Row Above', + insertRowBelowText : 'Row Below', + insertColumnLeftText : 'Column Left', + insertColumnRightText : 'Column Right', + deleteText : 'Delete', + deleteRowText : 'Delete Row', + deleteColumnText : 'Delete Column' }, SSE.Controllers.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 5c7c5058c..1dd24b78b 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -181,6 +181,18 @@ "SSE.Controllers.DocumentHolder.txtTop": "Top", "SSE.Controllers.DocumentHolder.txtUnderbar": "Bar under text", "SSE.Controllers.DocumentHolder.txtWidth": "Width", + "SSE.Controllers.DocumentHolder.insertText": "Insert", + "SSE.Controllers.DocumentHolder.alignmentText": "Alignment", + "SSE.Controllers.DocumentHolder.leftText": "Left", + "SSE.Controllers.DocumentHolder.rightText": "Right", + "SSE.Controllers.DocumentHolder.centerText": "Center", + "SSE.Controllers.DocumentHolder.insertRowAboveText": "Row Above", + "SSE.Controllers.DocumentHolder.insertRowBelowText": "Row Below", + "SSE.Controllers.DocumentHolder.insertColumnLeftText": "Column Left", + "SSE.Controllers.DocumentHolder.insertColumnRightText": "Column Right", + "SSE.Controllers.DocumentHolder.deleteText": "Delete", + "SSE.Controllers.DocumentHolder.deleteRowText": "Delete Row", + "SSE.Controllers.DocumentHolder.deleteColumnText": "Delete Column", "SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet", "SSE.Controllers.LeftMenu.textByColumns": "By columns", "SSE.Controllers.LeftMenu.textByRows": "By rows", From 28bdc1b91a4f5280cd68d1beac574c2ddfd9b0f6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 27 Oct 2016 13:38:24 +0300 Subject: [PATCH 07/36] Update translations. --- apps/presentationeditor/main/locale/ru.json | 4 ++++ apps/spreadsheeteditor/main/locale/ru.json | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 6cbaae64d..ec022c507 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -592,11 +592,13 @@ "PE.Views.DocumentHolder.advancedParagraphText": "Дополнительные параметры текста", "PE.Views.DocumentHolder.advancedShapeText": "Дополнительные параметры фигуры", "PE.Views.DocumentHolder.advancedTableText": "Дополнительные параметры таблицы", + "PE.Views.DocumentHolder.alignmentText": "Выравнивание", "PE.Views.DocumentHolder.belowText": "Ниже", "PE.Views.DocumentHolder.bottomCellText": "По нижнему краю", "PE.Views.DocumentHolder.cellAlignText": "Вертикальное выравнивание в ячейках", "PE.Views.DocumentHolder.cellText": "Ячейку", "PE.Views.DocumentHolder.centerCellText": "По центру", + "PE.Views.DocumentHolder.centerText": "По центру", "PE.Views.DocumentHolder.columnText": "Столбец", "PE.Views.DocumentHolder.deleteColumnText": "Удалить столбец", "PE.Views.DocumentHolder.deleteRowText": "Удалить строку", @@ -616,9 +618,11 @@ "PE.Views.DocumentHolder.insertRowBelowText": "Строку ниже", "PE.Views.DocumentHolder.insertRowText": "Вставить строку", "PE.Views.DocumentHolder.insertText": "Добавить", + "PE.Views.DocumentHolder.leftText": "По левому краю", "PE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки", "PE.Views.DocumentHolder.originalSizeText": "Размер по умолчанию", "PE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку", + "PE.Views.DocumentHolder.rightText": "По правому краю", "PE.Views.DocumentHolder.rowText": "Строку", "PE.Views.DocumentHolder.selectText": "Выделить", "PE.Views.DocumentHolder.splitCellsText": "Разделить ячейку...", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index dc0932073..ddae7f2c5 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -98,9 +98,21 @@ "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "Имя файла", "Common.Views.RenameDialog.txtInvalidName": "Имя файла не должно содержать следующих символов: ", + "SSE.Controllers.DocumentHolder.alignmentText": "Выравнивание", + "SSE.Controllers.DocumentHolder.centerText": "По центру", + "SSE.Controllers.DocumentHolder.deleteColumnText": "Удалить столбец", + "SSE.Controllers.DocumentHolder.deleteRowText": "Удалить строку", + "SSE.Controllers.DocumentHolder.deleteText": "Удалить", "SSE.Controllers.DocumentHolder.errorInvalidLink": "Ссылка указывает на несуществующую ячейку. Исправьте или удалите ссылку.", "SSE.Controllers.DocumentHolder.guestText": "Гость", + "SSE.Controllers.DocumentHolder.insertColumnLeftText": "Столбец слева", + "SSE.Controllers.DocumentHolder.insertColumnRightText": "Столбец справа", + "SSE.Controllers.DocumentHolder.insertRowAboveText": "Строку выше", + "SSE.Controllers.DocumentHolder.insertRowBelowText": "Строку ниже", + "SSE.Controllers.DocumentHolder.insertText": "Добавить", + "SSE.Controllers.DocumentHolder.leftText": "По левому краю", "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Внимание", + "SSE.Controllers.DocumentHolder.rightText": "По правому краю", "SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Ширина столбца {0} символов ({1} пикселей)", "SSE.Controllers.DocumentHolder.textChangeRowHeight": "Высота строки {0} пунктов ({1} пикселей)", "SSE.Controllers.DocumentHolder.textCtrlClick": "Нажмите клавишу CTRL и щелкните по ссылке", From 67cdfb5592de1eec5f1c838cb1f9b9e7ac637ac4 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 27 Oct 2016 14:39:54 +0300 Subject: [PATCH 08/36] Fix bug with underscore _.each method in IE9. --- apps/documenteditor/main/app/view/RightMenu.js | 2 +- apps/presentationeditor/main/app.js | 4 ++-- apps/presentationeditor/main/app/view/RightMenu.js | 2 +- apps/presentationeditor/main/app_dev.js | 4 ++-- apps/spreadsheeteditor/main/app/controller/RightMenu.js | 2 +- apps/spreadsheeteditor/main/app/view/RightMenu.js | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/documenteditor/main/app/view/RightMenu.js b/apps/documenteditor/main/app/view/RightMenu.js index 0288e6a30..d2dd62e99 100644 --- a/apps/documenteditor/main/app/view/RightMenu.js +++ b/apps/documenteditor/main/app/view/RightMenu.js @@ -280,7 +280,7 @@ define([ var target_pane = $(".right-panel"); target_pane.find('> .active').removeClass('active'); - _.each(this._settings, function(item){ + this._settings.forEach(function(item){ if (item.btn.isActive()) item.btn.toggle(false, true); }); diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js index 823fb4594..f241c26f6 100644 --- a/apps/presentationeditor/main/app.js +++ b/apps/presentationeditor/main/app.js @@ -154,8 +154,8 @@ require([ 'Main', 'Common.Controllers.Fonts' /** coauthoring begin **/ - , 'Common.Controllers.Chat', - 'Common.Controllers.Comments', + , 'Common.Controllers.Chat' + ,'Common.Controllers.Comments' /** coauthoring end **/ ,'Common.Controllers.Plugins' ,'Common.Controllers.ExternalDiagramEditor' diff --git a/apps/presentationeditor/main/app/view/RightMenu.js b/apps/presentationeditor/main/app/view/RightMenu.js index 5f78ff9c7..86ac9f41e 100644 --- a/apps/presentationeditor/main/app/view/RightMenu.js +++ b/apps/presentationeditor/main/app/view/RightMenu.js @@ -277,7 +277,7 @@ define([ clearSelection: function() { var target_pane = $(".right-panel"); target_pane.find('> .active').removeClass('active'); - _.each(this._settings, function(item){ + this._settings.forEach(function(item){ if (item.btn.isActive()) item.btn.toggle(false, true); }); diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js index 1a45df40d..d3e8cfecd 100644 --- a/apps/presentationeditor/main/app_dev.js +++ b/apps/presentationeditor/main/app_dev.js @@ -145,8 +145,8 @@ require([ 'Main', 'Common.Controllers.Fonts' /** coauthoring begin **/ - , 'Common.Controllers.Chat', - 'Common.Controllers.Comments', + , 'Common.Controllers.Chat' + ,'Common.Controllers.Comments' /** coauthoring end **/ ,'Common.Controllers.Plugins' ,'Common.Controllers.ExternalDiagramEditor' diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js index dc61d8f92..066abbe19 100644 --- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js @@ -126,7 +126,7 @@ define([ if (this._state.prevDisabled != need_disable) { this._state.prevDisabled = need_disable; - _.each(this._settings, function(item){ + this._settings.forEach(function(item){ item.panel.setLocked(need_disable); }); } diff --git a/apps/spreadsheeteditor/main/app/view/RightMenu.js b/apps/spreadsheeteditor/main/app/view/RightMenu.js index 1bd466574..0c8ba9b29 100644 --- a/apps/spreadsheeteditor/main/app/view/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/view/RightMenu.js @@ -240,7 +240,7 @@ define([ clearSelection: function() { var target_pane = $(".right-panel"); target_pane.find('> .active').removeClass('active'); - _.each(this._settings, function(item){ + this._settings.forEach(function(item){ if (item.btn.isActive()) item.btn.toggle(false, true); }); From 218385d38639b700bb60f2d501b283bddf7dad2a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 27 Oct 2016 15:42:02 +0300 Subject: [PATCH 09/36] Fix bug with underscore _.each method in IE9. --- apps/common/main/lib/component/Menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/Menu.js b/apps/common/main/lib/component/Menu.js index 61bd4b5a4..6afaf8581 100644 --- a/apps/common/main/lib/component/Menu.js +++ b/apps/common/main/lib/component/Menu.js @@ -125,7 +125,7 @@ define([ if (active && active.length > 0) { _.each(active, function(menu) { - menu.hide(); + if (menu) menu.hide(); }); return true; } From 6c7ea6afe2a657a15417d6bb7f112e495b0827d3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 28 Oct 2016 16:19:03 +0300 Subject: [PATCH 10/36] [DE] Changed format for data in setHistoryData. --- apps/common/main/lib/controller/History.js | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js index b7a5b39df..6618b7ad1 100644 --- a/apps/common/main/lib/controller/History.js +++ b/apps/common/main/lib/controller/History.js @@ -163,19 +163,32 @@ define([ if (historyStore && data!==null) { var rev, revisions = historyStore.findRevisions(data.version), urlGetTime = new Date(); - var diff = opts.data.urlDiff || opts.data.changesUrl; + var diff = opts.data.urlDiff || opts.data.changesUrl, + url, docId; + if (opts.data.current && opts.data.previous) { + url = _.isEmpty(diff) ? opts.data.current.url : opts.data.previous.url; + docId = _.isEmpty(diff) ? opts.data.current.key : opts.data.previous.key; + } else { + url = opts.data.url; + docId = _.isEmpty(diff) ? this.currentDocId : this.currentDocIdPrev; + } + if (revisions && revisions.length>0) { for(var i=0; i Date: Fri, 28 Oct 2016 16:38:33 +0300 Subject: [PATCH 11/36] Changed branding permissions. Use canBranding from license to hiding panels. --- apps/api/documents/api.js | 3 ++- .../documenteditor/main/app/controller/Main.js | 18 +++++++++++++----- apps/documenteditor/main/app/view/Toolbar.js | 2 +- .../main/app/controller/Main.js | 16 ++++++++++++---- .../main/app/view/Toolbar.js | 4 ++-- .../main/app/controller/Main.js | 16 ++++++++++++---- .../spreadsheeteditor/main/app/view/Toolbar.js | 4 ++-- 7 files changed, 44 insertions(+), 19 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 38554517a..62e2961ba 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -108,7 +108,8 @@ comments: false, leftMenu: true, rightMenu: true, - toolbar: true + toolbar: true, + header: true }, plugins: { autoStartGuid: 'asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}', diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 371d90fff..09fd6c3b9 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -61,10 +61,14 @@ define([ var mapCustomizationElements = { about: 'button#left-btn-about', feedback: 'button#left-btn-support', - goback: '#fm-btn-back > a, #header-back > div', + goback: '#fm-btn-back > a, #header-back > div' + }; + + var mapCustomizationExtElements = { toolbar: '#viewport #toolbar', - leftMenu: '#viewport #left-menu', - rightMenu: '#viewport #right-menu' + leftMenu: '#viewport #left-menu, #viewport #id-toolbar-full-placeholder-btn-settings, #viewport #id-toolbar-short-placeholder-btn-settings', + rightMenu: '#viewport #right-menu', + header: '#viewport #header' }; Common.localStorage.setId('text'); @@ -965,12 +969,14 @@ 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'); + this.appOptions.canBranding = (licType!==Asc.c_oLicenseResult.Error) && (typeof this.editorConfig.customization == 'object'); if (this.appOptions.canBranding) this.getApplication().getController('Viewport').getView('Common.Views.Header').setBranding(this.editorConfig.customization); params.asc_getTrial() && this.getApplication().getController('Viewport').getView('Common.Views.Header').setDeveloperMode(true); - + + this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object'); + this.applyModeCommonElements(); this.applyModeEditorElements(); @@ -1403,6 +1409,8 @@ define([ if (!this.appOptions.isDesktopApp) this.appOptions.customization.about = true; Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); + if (this.appOptions.canBrandingExt) + Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); } Common.NotificationCenter.trigger('layout:changed', 'main'); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 7e49aea01..7298b55ab 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1195,7 +1195,7 @@ define([ ] }) ); - if (this.mode.isDesktopApp) + if (this.mode.isDesktopApp || this.mode.canBrandingExt && this.mode.customization && this.mode.customization.header===false) this.mnuitemHideTitleBar.hide(); this.btnMarkers.setMenu( diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index d199878aa..4e3c0d5fb 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -59,10 +59,14 @@ define([ var mapCustomizationElements = { about: 'button#left-btn-about', feedback: 'button#left-btn-support', - goback: '#fm-btn-back > a, #header-back > div', + goback: '#fm-btn-back > a, #header-back > div' + }; + + var mapCustomizationExtElements = { toolbar: '#viewport #toolbar', - leftMenu: '#viewport #left-menu', - rightMenu: '#viewport #right-menu' + leftMenu: '#viewport #left-menu, #viewport #id-toolbar-full-placeholder-btn-settings, #viewport #id-toolbar-short-placeholder-btn-settings', + rightMenu: '#viewport #right-menu', + header: '#viewport #header' }; Common.localStorage.setId('presentation'); @@ -744,12 +748,14 @@ 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'); + this.appOptions.canBranding = (licType!==Asc.c_oLicenseResult.Error) && (typeof this.editorConfig.customization == 'object'); if (this.appOptions.canBranding) this.getApplication().getController('Viewport').getView('Common.Views.Header').setBranding(this.editorConfig.customization); params.asc_getTrial() && this.getApplication().getController('Viewport').getView('Common.Views.Header').setDeveloperMode(true); + this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object'); + this.applyModeCommonElements(); this.applyModeEditorElements(); @@ -1170,6 +1176,8 @@ define([ if (!this.appOptions.isDesktopApp) this.appOptions.customization.about = true; Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); + if (this.appOptions.canBrandingExt) + Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); } Common.NotificationCenter.trigger('layout:changed', 'main'); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 8d2b9802e..0c6a93e00 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1282,10 +1282,10 @@ define([ } } - if (mode.isDesktopApp) { + if (mode.isDesktopApp) $('.toolbar-group-native').hide(); + if (mode.isDesktopApp || mode.canBrandingExt && mode.customization && mode.customization.header===false) this.mnuitemHideTitleBar.hide(); - } this.lockToolbar(PE.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]}); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 4d1b9f8dc..7b0aa2d2e 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -65,10 +65,14 @@ define([ var mapCustomizationElements = { about: 'button#left-btn-about', feedback: 'button#left-btn-support', - goback: '#fm-btn-back > a, #header-back > div', + goback: '#fm-btn-back > a, #header-back > div' + }; + + var mapCustomizationExtElements = { toolbar: '#viewport #toolbar', - leftMenu: '#viewport #left-menu', - rightMenu: '#viewport #right-menu' + leftMenu: '#viewport #left-menu, #viewport #id-toolbar-full-placeholder-btn-settings, #viewport #id-toolbar-short-placeholder-btn-settings', + rightMenu: '#viewport #right-menu', + header: '#viewport #header' }; Common.localStorage.setId('table'); @@ -761,10 +765,12 @@ define([ this.appOptions.canComments = this.appOptions.canLicense && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false); 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'); + this.appOptions.canBranding = (licType!==Asc.c_oLicenseResult.Error) && (typeof this.editorConfig.customization == 'object'); if (this.appOptions.canBranding) this.headerView.setBranding(this.editorConfig.customization); + this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object'); + params.asc_getTrial() && this.headerView.setDeveloperMode(true); } @@ -1297,6 +1303,8 @@ define([ if (!this.appOptions.isDesktopApp) this.appOptions.customization.about = true; Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); + if (this.appOptions.canBrandingExt) + Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); } this.stackLongActions.pop({id: InitApplication, type: Asc.c_oAscAsyncActionType.BlockInteraction}); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 6aaa5c58a..442e939bb 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1650,10 +1650,10 @@ define([ } } - if (mode.isDesktopApp) { + if (mode.isDesktopApp) $('.toolbar-group-native').hide(); + if (mode.isDesktopApp || mode.canBrandingExt && mode.customization && mode.customization.header===false) this.mnuitemHideTitleBar.hide(); - } this.lockToolbar(SSE.enumLock.cantPrint, !mode.canPrint, {array: [this.btnPrint]}); } From a8dbadb2ae9acda2466bf09086997e5235e63731 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 28 Oct 2016 16:52:51 +0300 Subject: [PATCH 12/36] Update translations. --- apps/documenteditor/main/locale/fr.json | 8 +- apps/presentationeditor/main/locale/fr.json | 448 +++++++++++++++++- apps/spreadsheeteditor/main/locale/fr.json | 492 ++++++++++++++++++-- 3 files changed, 894 insertions(+), 54 deletions(-) diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 9944f0188..70b0a8832 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -145,7 +145,7 @@ "Common.Views.Header.txtRename": "Renommer", "Common.Views.History.textCloseHistory": "Fermer l'historique", "Common.Views.History.textHide": "Réduire", - "Common.Views.History.textHideAll": "Hide detailed changes", + "Common.Views.History.textHideAll": "Masquer les modifications détaillées", "Common.Views.History.textRestore": "Restaurer", "Common.Views.History.textShow": "Développer", "Common.Views.History.textShowAll": "Afficher les modifications détaillées", @@ -220,7 +220,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,
but will not be able to download or print until the connection is restored.", + "DE.Controllers.Main.errorViewerDisconnect": "La connexion a été perdue. Vous pouvez toujours afficher le document,
mais ne pouvez pas le télécharger ou l'imprimer jusqu'à ce que la connexion soit rétablie.", "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", @@ -290,7 +290,7 @@ "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": "Votre licence a expiré.
Veuillez mettre à jour votre licence et actualisez la 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).
If you need more please consider purchasing a commercial license.", + "DE.Controllers.Main.warnNoLicense": "Vous utilisez la version open source de ONLYOFFICE. La version a des limitations en connexions simultanées au serveur de documents (20 connexions à la fois).
Pour en avoir plus, veuillez envisager l'achat d'une licence commerciale.", "DE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.", "DE.Controllers.Statusbar.textHasChanges": "Nouveaux changements ont été suivis", "DE.Controllers.Statusbar.textTrackChanges": "Le document est ouvert avec le mode Suivi des modifications activé", @@ -760,7 +760,7 @@ "DE.Views.DocumentHolder.txtDeleteArg": "Supprimer l'argument", "DE.Views.DocumentHolder.txtDeleteBreak": "Supprimer un saut manuel", "DE.Views.DocumentHolder.txtDeleteChars": "Supprimer caractères enserrant", - "DE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Supprimer renfermant des caractères et des séparateurs", + "DE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Supprimer caractères et séparateurs qui entourent", "DE.Views.DocumentHolder.txtDeleteEq": "Supprimer l'équation", "DE.Views.DocumentHolder.txtDeleteGroupChar": "Supprimer caractère d'imprimerie", "DE.Views.DocumentHolder.txtDeleteRadical": "Supprimer radical", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index 7201bf8a1..beac0ee03 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -80,6 +80,8 @@ "Common.Views.ExternalDiagramEditor.textTitle": "Éditeur de graphique", "Common.Views.Header.openNewTabText": "Ouvrir dans un nouvel onglet", "Common.Views.Header.textBack": "Aller aux Documents", + "Common.Views.Header.txtHeaderDeveloper": "MODE DEVELOPPEUR", + "Common.Views.Header.txtRename": "Renommer", "Common.Views.ImageFromUrlDialog.cancelButtonText": "Annuler", "Common.Views.ImageFromUrlDialog.okButtonText": "OK", "Common.Views.ImageFromUrlDialog.textUrl": "Coller URL d'image:", @@ -93,16 +95,25 @@ "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.OpenDialog.cancelButtonText": "Annuler", + "Common.Views.OpenDialog.okButtonText": "OK", + "Common.Views.OpenDialog.txtEncoding": "Codage ", + "Common.Views.OpenDialog.txtPassword": "Mot de passe", + "Common.Views.OpenDialog.txtTitle": "Choisir les options %1", + "Common.Views.OpenDialog.txtTitleProtected": "Fichier protégé", + "Common.Views.PluginDlg.textLoading": "Chargement", "Common.Views.Plugins.strPlugins": "Plugins", "Common.Views.Plugins.textLoading": "Chargement", "Common.Views.Plugins.textStart": "Lancer", + "Common.Views.RenameDialog.cancelButtonText": "Annuler", + "Common.Views.RenameDialog.okButtonText": "Ok", + "Common.Views.RenameDialog.textName": "Nom de fichier", + "Common.Views.RenameDialog.txtInvalidName": "Un nom de fichier ne peut pas contenir les caractères suivants :", "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.", "PE.Controllers.Main.applyChangesTextText": "Chargement des données...", "PE.Controllers.Main.applyChangesTitleText": "Chargement des données", - "PE.Controllers.Main.convertationErrorText": "Échec de la conversion.", "PE.Controllers.Main.convertationTimeoutText": "Expiration du délai de conversion.", "PE.Controllers.Main.criticalErrorExtText": "Cliquez sur \"OK\" pour revenir à la liste des documents.", "PE.Controllers.Main.criticalErrorTitle": "Erreur", @@ -123,7 +134,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,
but will not be able to download or print until the connection is restored.", + "PE.Controllers.Main.errorViewerDisconnect": "La connexion a été perdue. Vous pouvez toujours afficher le document,
mais ne pouvez pas le télécharger ou l'imprimer jusqu'à ce que la connexion soit rétablie.", "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", @@ -138,7 +149,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.openErrorText": "Une erreur s’est produite lors de l’ouverture du fichier", "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...", @@ -146,7 +157,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.saveErrorText": "Une erreur s'est produite lors de l'enregistrement du fichier", "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...", @@ -163,7 +174,7 @@ "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.
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.titleLicenseExp": "Licence expirée", "PE.Controllers.Main.txtArt": "Your text here", "PE.Controllers.Main.txtBasicShapes": "Formes de base", "PE.Controllers.Main.txtButtons": "Boutons", @@ -225,14 +236,342 @@ "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.
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).
If you need more please consider purchasing a commercial license.", + "PE.Controllers.Main.warnLicenseExp": "Votre licence a expiré.
Veuillez mettre à jour votre licence et actualisez la page.", + "PE.Controllers.Main.warnNoLicense": "Vous utilisez la version open source de ONLYOFFICE. La version a des limitations en connexions simultanées au serveur de documents (20 connexions à la fois).
Pour en avoir plus, veuillez envisager l'achat d'une licence commerciale.", "PE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "La police que vous allez enregistrer n'est pas disponible sur l'appareil actuel.
Le style du texte sera affiché à l'aide de l'une des polices de système, la police sauvée sera utilisée lorsqu'elle est disponible.
Voulez-vous continuer?", + "PE.Controllers.Toolbar.textAccent": "Types d'accentuation", + "PE.Controllers.Toolbar.textBracket": "Crochets", "PE.Controllers.Toolbar.textEmptyImgUrl": "Specifiez URL d'image.", "PE.Controllers.Toolbar.textFontSizeErr": "La valeur entrée est incorrecte.
Entrez une valeur numérique entre 1 et 100", + "PE.Controllers.Toolbar.textFraction": "Fractions", + "PE.Controllers.Toolbar.textFunction": "Fonctions", + "PE.Controllers.Toolbar.textIntegral": "Intégrales", + "PE.Controllers.Toolbar.textLargeOperator": "Grands opérateurs", + "PE.Controllers.Toolbar.textLimitAndLog": "Limites et logarithmes ", + "PE.Controllers.Toolbar.textMatrix": "Matrices", + "PE.Controllers.Toolbar.textOperator": "Opérateurs", + "PE.Controllers.Toolbar.textRadical": "Radicaux", + "PE.Controllers.Toolbar.textScript": "Scripts", + "PE.Controllers.Toolbar.textSymbols": "Symboles", "PE.Controllers.Toolbar.textWarning": "Avertissement", + "PE.Controllers.Toolbar.txtAccent_Accent": "Aigu", + "PE.Controllers.Toolbar.txtAccent_ArrowD": "Flèche gauche-droite au-dessus", + "PE.Controllers.Toolbar.txtAccent_ArrowL": "Flèche vers la gauche au-dessus", + "PE.Controllers.Toolbar.txtAccent_ArrowR": "Flèche vers la droite au-dessus", + "PE.Controllers.Toolbar.txtAccent_Bar": "Barre", + "PE.Controllers.Toolbar.txtAccent_BarBot": "Barre inférieure", + "PE.Controllers.Toolbar.txtAccent_BarTop": "Barre supérieure", + "PE.Controllers.Toolbar.txtAccent_BorderBox": "Formule encadrée (avec espace réservé)", + "PE.Controllers.Toolbar.txtAccent_BorderBoxCustom": "Formule encadrée (exemple)", + "PE.Controllers.Toolbar.txtAccent_Check": "Cocher", + "PE.Controllers.Toolbar.txtAccent_CurveBracketBot": "Accolade inférieure", + "PE.Controllers.Toolbar.txtAccent_CurveBracketTop": "Accolade supérieure", + "PE.Controllers.Toolbar.txtAccent_Custom_1": "Vecteur A", + "PE.Controllers.Toolbar.txtAccent_Custom_2": "ABC avec barre supérieure", + "PE.Controllers.Toolbar.txtAccent_Custom_3": "x XOR y avec barre supérieure", + "PE.Controllers.Toolbar.txtAccent_DDDot": "Point triple", + "PE.Controllers.Toolbar.txtAccent_DDot": "Point double", + "PE.Controllers.Toolbar.txtAccent_Dot": "Point", + "PE.Controllers.Toolbar.txtAccent_DoubleBar": "Barre supérieure double", + "PE.Controllers.Toolbar.txtAccent_Grave": "Grave", + "PE.Controllers.Toolbar.txtAccent_GroupBot": "Regroupement de caractère en dessus", + "PE.Controllers.Toolbar.txtAccent_GroupTop": "Regroupement de caractère au-dessus", + "PE.Controllers.Toolbar.txtAccent_HarpoonL": "Harpon gauche au-dessus", + "PE.Controllers.Toolbar.txtAccent_HarpoonR": "Harpon droite au-dessus", + "PE.Controllers.Toolbar.txtAccent_Hat": "Chapeau", + "PE.Controllers.Toolbar.txtAccent_Smile": "Brève", + "PE.Controllers.Toolbar.txtAccent_Tilde": "Tilde", + "PE.Controllers.Toolbar.txtBracket_Angle": "Crochets", + "PE.Controllers.Toolbar.txtBracket_Angle_Delimiter_2": "Crochets avec séparateurs", + "PE.Controllers.Toolbar.txtBracket_Angle_Delimiter_3": "Crochets avec séparateurs", + "PE.Controllers.Toolbar.txtBracket_Angle_NoneOpen": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_Angle_OpenNone": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_Curve": "Crochets", + "PE.Controllers.Toolbar.txtBracket_Curve_Delimiter_2": "Crochets avec séparateurs", + "PE.Controllers.Toolbar.txtBracket_Curve_NoneOpen": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_Curve_OpenNone": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_Custom_1": "Cas (deux conditions)", + "PE.Controllers.Toolbar.txtBracket_Custom_2": "Cas (trois conditions)", + "PE.Controllers.Toolbar.txtBracket_Custom_3": "Objet empilé", + "PE.Controllers.Toolbar.txtBracket_Custom_4": "Objet empilé", + "PE.Controllers.Toolbar.txtBracket_Custom_5": "Exemple de cas", + "PE.Controllers.Toolbar.txtBracket_Custom_6": "Coefficient binomial", + "PE.Controllers.Toolbar.txtBracket_Custom_7": "Coefficient binomial", + "PE.Controllers.Toolbar.txtBracket_Line": "Crochets", + "PE.Controllers.Toolbar.txtBracket_Line_NoneOpen": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_Line_OpenNone": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_LineDouble": "Crochets", + "PE.Controllers.Toolbar.txtBracket_LineDouble_NoneOpen": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_LineDouble_OpenNone": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_LowLim": "Crochets", + "PE.Controllers.Toolbar.txtBracket_LowLim_NoneNone": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_LowLim_OpenNone": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_Round": "Crochets", + "PE.Controllers.Toolbar.txtBracket_Round_Delimiter_2": "Crochets avec séparateurs", + "PE.Controllers.Toolbar.txtBracket_Round_NoneOpen": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_Round_OpenNone": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_Square": "Crochets", + "PE.Controllers.Toolbar.txtBracket_Square_CloseClose": "Crochets", + "PE.Controllers.Toolbar.txtBracket_Square_CloseOpen": "Crochets", + "PE.Controllers.Toolbar.txtBracket_Square_NoneOpen": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_Square_OpenNone": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_Square_OpenOpen": "Crochets", + "PE.Controllers.Toolbar.txtBracket_SquareDouble": "Crochets", + "PE.Controllers.Toolbar.txtBracket_SquareDouble_NoneOpen": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_SquareDouble_OpenNone": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_UppLim": "Crochets", + "PE.Controllers.Toolbar.txtBracket_UppLim_NoneOpen": "Crochet unique", + "PE.Controllers.Toolbar.txtBracket_UppLim_OpenNone": "Crochet unique", + "PE.Controllers.Toolbar.txtFractionDiagonal": "Fraction oblique", + "PE.Controllers.Toolbar.txtFractionDifferential_1": "Différentiel", + "PE.Controllers.Toolbar.txtFractionDifferential_2": "Différentiel", + "PE.Controllers.Toolbar.txtFractionDifferential_3": "Différentiel", + "PE.Controllers.Toolbar.txtFractionDifferential_4": "Différentiel", + "PE.Controllers.Toolbar.txtFractionHorizontal": "Fraction sur une ligne", + "PE.Controllers.Toolbar.txtFractionPi_2": "Pi divisé par 2", + "PE.Controllers.Toolbar.txtFractionSmall": "Petite fraction", + "PE.Controllers.Toolbar.txtFractionVertical": "Fraction sur deux lignes", + "PE.Controllers.Toolbar.txtFunction_1_Cos": "Cosinus inverse", + "PE.Controllers.Toolbar.txtFunction_1_Cosh": "Сosinus inverse hyperbolique", + "PE.Controllers.Toolbar.txtFunction_1_Cot": "Cotangente inverse", + "PE.Controllers.Toolbar.txtFunction_1_Coth": "Сotangente inverse hyperbolique", + "PE.Controllers.Toolbar.txtFunction_1_Csc": "Cosécante inverse", + "PE.Controllers.Toolbar.txtFunction_1_Csch": "Сosécante inverse hyperbolique", + "PE.Controllers.Toolbar.txtFunction_1_Sec": "Sécante inverse", + "PE.Controllers.Toolbar.txtFunction_1_Sech": "Sécante inverse hyperbolique", + "PE.Controllers.Toolbar.txtFunction_1_Sin": "Sinus inverse", + "PE.Controllers.Toolbar.txtFunction_1_Sinh": "Sinus inverse hyperbolique", + "PE.Controllers.Toolbar.txtFunction_1_Tan": "Tangente inverse", + "PE.Controllers.Toolbar.txtFunction_1_Tanh": "Tangente inverse hyperbolique", + "PE.Controllers.Toolbar.txtFunction_Cos": "Fonction cosinus", + "PE.Controllers.Toolbar.txtFunction_Cosh": "Cosinus hyperbolique", + "PE.Controllers.Toolbar.txtFunction_Cot": "Fonction cotangente", + "PE.Controllers.Toolbar.txtFunction_Coth": "Cotangente hyperbolique", + "PE.Controllers.Toolbar.txtFunction_Csc": "Fonction cosécante", + "PE.Controllers.Toolbar.txtFunction_Csch": "Fonction cosécante hyperbolique", + "PE.Controllers.Toolbar.txtFunction_Custom_1": "Sinus thêta", + "PE.Controllers.Toolbar.txtFunction_Custom_2": "Cosinus 2x", + "PE.Controllers.Toolbar.txtFunction_Custom_3": "Formule de la tangente", + "PE.Controllers.Toolbar.txtFunction_Sec": "Fonction sécante", + "PE.Controllers.Toolbar.txtFunction_Sech": "Sécante hyperbolique", + "PE.Controllers.Toolbar.txtFunction_Sin": "Fonction sinus", + "PE.Controllers.Toolbar.txtFunction_Sinh": "Sinus hyperbolique", + "PE.Controllers.Toolbar.txtFunction_Tan": "Formule de la tangente", + "PE.Controllers.Toolbar.txtFunction_Tanh": "Tangente hyperbolique", + "PE.Controllers.Toolbar.txtIntegral": "Intégrale", + "PE.Controllers.Toolbar.txtIntegral_dtheta": "Thêta différentiel", + "PE.Controllers.Toolbar.txtIntegral_dx": "Différentiel x", + "PE.Controllers.Toolbar.txtIntegral_dy": "Différentiel y", + "PE.Controllers.Toolbar.txtIntegralCenterSubSup": "Intégrale", + "PE.Controllers.Toolbar.txtIntegralDouble": "Double intégrale", + "PE.Controllers.Toolbar.txtIntegralDoubleCenterSubSup": "Double intégrale", + "PE.Controllers.Toolbar.txtIntegralDoubleSubSup": "Double intégrale", + "PE.Controllers.Toolbar.txtIntegralOriented": "Intégrale de contour", + "PE.Controllers.Toolbar.txtIntegralOrientedCenterSubSup": "Intégrale de contour", + "PE.Controllers.Toolbar.txtIntegralOrientedDouble": "Intégrale de surface", + "PE.Controllers.Toolbar.txtIntegralOrientedDoubleCenterSubSup": "Intégrale de surface", + "PE.Controllers.Toolbar.txtIntegralOrientedDoubleSubSup": "Intégrale de surface", + "PE.Controllers.Toolbar.txtIntegralOrientedSubSup": "Intégrale de contour", + "PE.Controllers.Toolbar.txtIntegralOrientedTriple": "Intégrale de volume", + "PE.Controllers.Toolbar.txtIntegralOrientedTripleCenterSubSup": "Intégrale de volume", + "PE.Controllers.Toolbar.txtIntegralOrientedTripleSubSup": "Intégrale de volume", + "PE.Controllers.Toolbar.txtIntegralSubSup": "Intégrale", + "PE.Controllers.Toolbar.txtIntegralTriple": "Triple intégrale", + "PE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Triple intégrale", + "PE.Controllers.Toolbar.txtIntegralTripleSubSup": "Triple intégrale", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Coin", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Coin", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Coin", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Coin", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Coin", + "PE.Controllers.Toolbar.txtLargeOperator_CoProd": "Co-produit", + "PE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Co-produit", + "PE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Co-produit", + "PE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Co-produit", + "PE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Co-produit", + "PE.Controllers.Toolbar.txtLargeOperator_Custom_1": "Somme", + "PE.Controllers.Toolbar.txtLargeOperator_Custom_2": "Somme", + "PE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Somme", + "PE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Produit", + "PE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Union", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction": "en V", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "en V", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "en V", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "en V", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "en V", + "PE.Controllers.Toolbar.txtLargeOperator_Intersection": "Intersection", + "PE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSub": "Intersection", + "PE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSubSup": "Intersection", + "PE.Controllers.Toolbar.txtLargeOperator_Intersection_Sub": "Intersection", + "PE.Controllers.Toolbar.txtLargeOperator_Intersection_SubSup": "Intersection", + "PE.Controllers.Toolbar.txtLargeOperator_Prod": "Produit", + "PE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSub": "Produit", + "PE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSubSup": "Produit", + "PE.Controllers.Toolbar.txtLargeOperator_Prod_Sub": "Produit", + "PE.Controllers.Toolbar.txtLargeOperator_Prod_SubSup": "Produit", + "PE.Controllers.Toolbar.txtLargeOperator_Sum": "Somme", + "PE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSub": "Somme", + "PE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSubSup": "Somme", + "PE.Controllers.Toolbar.txtLargeOperator_Sum_Sub": "Somme", + "PE.Controllers.Toolbar.txtLargeOperator_Sum_SubSup": "Somme", + "PE.Controllers.Toolbar.txtLargeOperator_Union": "Union", + "PE.Controllers.Toolbar.txtLargeOperator_Union_CenterSub": "Union", + "PE.Controllers.Toolbar.txtLargeOperator_Union_CenterSubSup": "Union", + "PE.Controllers.Toolbar.txtLargeOperator_Union_Sub": "Union", + "PE.Controllers.Toolbar.txtLargeOperator_Union_SubSup": "Union", + "PE.Controllers.Toolbar.txtLimitLog_Custom_1": "Exemple de limite", + "PE.Controllers.Toolbar.txtLimitLog_Custom_2": "Exemple de maximum", + "PE.Controllers.Toolbar.txtLimitLog_Lim": "Limite", + "PE.Controllers.Toolbar.txtLimitLog_Ln": "Logarithme naturel", + "PE.Controllers.Toolbar.txtLimitLog_Log": "Logarithme", + "PE.Controllers.Toolbar.txtLimitLog_LogBase": "Logarithme", + "PE.Controllers.Toolbar.txtLimitLog_Max": "Maximum", + "PE.Controllers.Toolbar.txtLimitLog_Min": "Minimum", + "PE.Controllers.Toolbar.txtMatrix_1_2": "Matrice vide 1x2 ", + "PE.Controllers.Toolbar.txtMatrix_1_3": "Matrice vide 1x3", + "PE.Controllers.Toolbar.txtMatrix_2_1": "Matrice vide 2x1", + "PE.Controllers.Toolbar.txtMatrix_2_2": "Matrice vide 2x2", + "PE.Controllers.Toolbar.txtMatrix_2_2_DLineBracket": "Matrice vide avec crochets", + "PE.Controllers.Toolbar.txtMatrix_2_2_LineBracket": "Matrice vide avec crochets", + "PE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Matrice vide avec crochets", + "PE.Controllers.Toolbar.txtMatrix_2_2_SquareBracket": "Matrice vide avec crochets", + "PE.Controllers.Toolbar.txtMatrix_2_3": "Matrice vide 2x3", + "PE.Controllers.Toolbar.txtMatrix_3_1": "Matrice vide 3x1", + "PE.Controllers.Toolbar.txtMatrix_3_2": "Matrice vide 3x2", + "PE.Controllers.Toolbar.txtMatrix_3_3": "Matrice vide 3x3", + "PE.Controllers.Toolbar.txtMatrix_Dots_Baseline": "Points de ligne de base", + "PE.Controllers.Toolbar.txtMatrix_Dots_Center": "Points d'interligne", + "PE.Controllers.Toolbar.txtMatrix_Dots_Diagonal": "Points diagonaux", + "PE.Controllers.Toolbar.txtMatrix_Dots_Vertical": "Points verticaux", + "PE.Controllers.Toolbar.txtMatrix_Flat_Round": "Matrice avec pointillés", + "PE.Controllers.Toolbar.txtMatrix_Flat_Square": "Matrice avec pointillés", + "PE.Controllers.Toolbar.txtMatrix_Identity_2": "Matrice d'identité 2x2", + "PE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "Matrice d'identité 3x3", + "PE.Controllers.Toolbar.txtMatrix_Identity_3": "Matrice d'identité 3x3", + "PE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "Matrice d'identité 3x3", + "PE.Controllers.Toolbar.txtOperator_ArrowD_Bot": "Flèche gauche-droite en dessous", + "PE.Controllers.Toolbar.txtOperator_ArrowD_Top": "Flèche gauche-droite au-dessus", + "PE.Controllers.Toolbar.txtOperator_ArrowL_Bot": "Flèche vers la gauche en dessous", + "PE.Controllers.Toolbar.txtOperator_ArrowL_Top": "Flèche vers la gauche au-dessus", + "PE.Controllers.Toolbar.txtOperator_ArrowR_Bot": "Flèche vers la droite en dessous", + "PE.Controllers.Toolbar.txtOperator_ArrowR_Top": "Flèche vers la droite au-dessus", + "PE.Controllers.Toolbar.txtOperator_ColonEquals": "Deux-points Égal", + "PE.Controllers.Toolbar.txtOperator_Custom_1": "Produits", + "PE.Controllers.Toolbar.txtOperator_Custom_2": "Produits delta", + "PE.Controllers.Toolbar.txtOperator_Definition": "Égal par définition à", + "PE.Controllers.Toolbar.txtOperator_DeltaEquals": "Delta égal à", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowD_Bot": "Flèche gauche-droite en dessous", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowD_Top": "Flèche gauche-droite au-dessus", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowL_Bot": "Flèche vers la gauche en dessous", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowL_Top": "Flèche vers la gauche au-dessus", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowR_Bot": "Flèche vers la droite en dessous", + "PE.Controllers.Toolbar.txtOperator_DoubleArrowR_Top": "Flèche vers la droite au-dessus", + "PE.Controllers.Toolbar.txtOperator_EqualsEquals": "Égal Égal", + "PE.Controllers.Toolbar.txtOperator_MinusEquals": "Moins égal", + "PE.Controllers.Toolbar.txtOperator_PlusEquals": "Plus Égal", + "PE.Controllers.Toolbar.txtOperator_UnitOfMeasure": "Mesuré(e) par", + "PE.Controllers.Toolbar.txtRadicalCustom_1": "Radical", + "PE.Controllers.Toolbar.txtRadicalCustom_2": "Radical", + "PE.Controllers.Toolbar.txtRadicalRoot_2": "Racine carrée avec degré", + "PE.Controllers.Toolbar.txtRadicalRoot_3": "Racine cubique", + "PE.Controllers.Toolbar.txtRadicalRoot_n": "Radical avec degré", + "PE.Controllers.Toolbar.txtRadicalSqrt": "Racine carrée", + "PE.Controllers.Toolbar.txtScriptCustom_1": "Script", + "PE.Controllers.Toolbar.txtScriptCustom_2": "Script", + "PE.Controllers.Toolbar.txtScriptCustom_3": "Script", + "PE.Controllers.Toolbar.txtScriptCustom_4": "Script", + "PE.Controllers.Toolbar.txtScriptSub": "Indice", + "PE.Controllers.Toolbar.txtScriptSubSup": "Indice-Exposant", + "PE.Controllers.Toolbar.txtScriptSubSupLeft": "Indice-Exposant gauche", + "PE.Controllers.Toolbar.txtScriptSup": "Exposant", + "PE.Controllers.Toolbar.txtSymbol_about": "Approximativement", + "PE.Controllers.Toolbar.txtSymbol_additional": "Complément", + "PE.Controllers.Toolbar.txtSymbol_aleph": "Aleph", + "PE.Controllers.Toolbar.txtSymbol_alpha": "Alpha", + "PE.Controllers.Toolbar.txtSymbol_approx": "Presque égale à", + "PE.Controllers.Toolbar.txtSymbol_ast": "Opérateur astérisque", + "PE.Controllers.Toolbar.txtSymbol_beta": "Bêta", + "PE.Controllers.Toolbar.txtSymbol_beth": "Beth", + "PE.Controllers.Toolbar.txtSymbol_bullet": "Opérateur puce", + "PE.Controllers.Toolbar.txtSymbol_cap": "Intersection", + "PE.Controllers.Toolbar.txtSymbol_cbrt": "Racine cubique", + "PE.Controllers.Toolbar.txtSymbol_cdots": "Trois points médians", + "PE.Controllers.Toolbar.txtSymbol_celsius": "Degrés Celsius", + "PE.Controllers.Toolbar.txtSymbol_chi": "Сhi", + "PE.Controllers.Toolbar.txtSymbol_cong": "Approximativement égal à", + "PE.Controllers.Toolbar.txtSymbol_cup": "Union", + "PE.Controllers.Toolbar.txtSymbol_ddots": "Trois points diagonaux vers le coin bas à droite", + "PE.Controllers.Toolbar.txtSymbol_degree": "Degrés", + "PE.Controllers.Toolbar.txtSymbol_delta": "Delta", + "PE.Controllers.Toolbar.txtSymbol_div": "Signe de division", + "PE.Controllers.Toolbar.txtSymbol_downarrow": "Flèche vers le bas", + "PE.Controllers.Toolbar.txtSymbol_emptyset": "Ensemble vide", + "PE.Controllers.Toolbar.txtSymbol_epsilon": "Epsilon", + "PE.Controllers.Toolbar.txtSymbol_equals": "Égal", + "PE.Controllers.Toolbar.txtSymbol_equiv": "Identique à", + "PE.Controllers.Toolbar.txtSymbol_eta": "Êta", + "PE.Controllers.Toolbar.txtSymbol_exists": "Existant", + "PE.Controllers.Toolbar.txtSymbol_factorial": "Factorielle", + "PE.Controllers.Toolbar.txtSymbol_fahrenheit": "Degrés Fahrenheit", + "PE.Controllers.Toolbar.txtSymbol_forall": "Pour tous", + "PE.Controllers.Toolbar.txtSymbol_gamma": "Gamma", + "PE.Controllers.Toolbar.txtSymbol_geq": "Est supérieur ou égal à", + "PE.Controllers.Toolbar.txtSymbol_gg": "Plus grand que", + "PE.Controllers.Toolbar.txtSymbol_greater": "Supérieur à", + "PE.Controllers.Toolbar.txtSymbol_in": "Élément de", + "PE.Controllers.Toolbar.txtSymbol_inc": "Incrément", + "PE.Controllers.Toolbar.txtSymbol_infinity": "Infini", + "PE.Controllers.Toolbar.txtSymbol_iota": "Iota", + "PE.Controllers.Toolbar.txtSymbol_kappa": "Kappa", + "PE.Controllers.Toolbar.txtSymbol_lambda": "Lambda", + "PE.Controllers.Toolbar.txtSymbol_leftarrow": "Flèche gauche", + "PE.Controllers.Toolbar.txtSymbol_leftrightarrow": "Double flèche horizontale", + "PE.Controllers.Toolbar.txtSymbol_leq": "Est inférieur ou égal à", + "PE.Controllers.Toolbar.txtSymbol_less": "Inférieur à", + "PE.Controllers.Toolbar.txtSymbol_ll": "Plus moins que", + "PE.Controllers.Toolbar.txtSymbol_minus": "Moins", + "PE.Controllers.Toolbar.txtSymbol_mp": "Moins plus", + "PE.Controllers.Toolbar.txtSymbol_mu": "Mu", + "PE.Controllers.Toolbar.txtSymbol_nabla": "Nabla", + "PE.Controllers.Toolbar.txtSymbol_neq": "N'est pas égal à", + "PE.Controllers.Toolbar.txtSymbol_ni": "Contient comme élément", + "PE.Controllers.Toolbar.txtSymbol_not": "Signe négation", + "PE.Controllers.Toolbar.txtSymbol_notexists": "Inexistant", + "PE.Controllers.Toolbar.txtSymbol_nu": "Nu", + "PE.Controllers.Toolbar.txtSymbol_o": "Omicron", + "PE.Controllers.Toolbar.txtSymbol_omega": "Omega", + "PE.Controllers.Toolbar.txtSymbol_partial": "Différentielle partielle", + "PE.Controllers.Toolbar.txtSymbol_percent": "Pourcentage", + "PE.Controllers.Toolbar.txtSymbol_phi": "Phi", + "PE.Controllers.Toolbar.txtSymbol_pi": "Pi", + "PE.Controllers.Toolbar.txtSymbol_plus": "Plus", + "PE.Controllers.Toolbar.txtSymbol_pm": "Plus moins", + "PE.Controllers.Toolbar.txtSymbol_propto": "Proportionnel à", + "PE.Controllers.Toolbar.txtSymbol_psi": "Psi", + "PE.Controllers.Toolbar.txtSymbol_qdrt": "Racine quatrième", + "PE.Controllers.Toolbar.txtSymbol_qed": "Ce qu'il fallait démontrer", + "PE.Controllers.Toolbar.txtSymbol_rddots": "Trois points diagonaux vers le coin haut à droite", + "PE.Controllers.Toolbar.txtSymbol_rho": "Rho", + "PE.Controllers.Toolbar.txtSymbol_rightarrow": "Flèche droite", + "PE.Controllers.Toolbar.txtSymbol_sigma": "Sigma", + "PE.Controllers.Toolbar.txtSymbol_sqrt": "Symbole de radical", + "PE.Controllers.Toolbar.txtSymbol_tau": "Tau", + "PE.Controllers.Toolbar.txtSymbol_therefore": "Par conséquent", + "PE.Controllers.Toolbar.txtSymbol_theta": "Thêta", + "PE.Controllers.Toolbar.txtSymbol_times": "Signe de multiplication", + "PE.Controllers.Toolbar.txtSymbol_uparrow": "Flèche vers le haut", + "PE.Controllers.Toolbar.txtSymbol_upsilon": "Upsilon", + "PE.Controllers.Toolbar.txtSymbol_varepsilon": "Variante epsilon", + "PE.Controllers.Toolbar.txtSymbol_varphi": "Variante phi", + "PE.Controllers.Toolbar.txtSymbol_varpi": "Variante pi", + "PE.Controllers.Toolbar.txtSymbol_varrho": "Variante rho", + "PE.Controllers.Toolbar.txtSymbol_varsigma": "Variante sigma", + "PE.Controllers.Toolbar.txtSymbol_vartheta": "Variante thêta", + "PE.Controllers.Toolbar.txtSymbol_vdots": "Trois points verticaux", + "PE.Controllers.Toolbar.txtSymbol_xsi": "Xi", + "PE.Controllers.Toolbar.txtSymbol_zeta": "Zêta", "PE.Views.ChartSettings.textArea": "Zone graphique", "PE.Views.ChartSettings.textBar": "Diagramme à barres", "PE.Views.ChartSettings.textChartType": "Modifier le type de graphique", @@ -253,11 +592,13 @@ "PE.Views.DocumentHolder.advancedParagraphText": "Paramètres avancés du texte", "PE.Views.DocumentHolder.advancedShapeText": "Paramètres avancés de la forme", "PE.Views.DocumentHolder.advancedTableText": "Paramètres avancés du tableau", + "PE.Views.DocumentHolder.alignmentText": "Alignement", "PE.Views.DocumentHolder.belowText": "En dessous", "PE.Views.DocumentHolder.bottomCellText": "Aligner en bas", "PE.Views.DocumentHolder.cellAlignText": "Alignement vertical de cellule", "PE.Views.DocumentHolder.cellText": "Cellule", "PE.Views.DocumentHolder.centerCellText": "Aligner au centre", + "PE.Views.DocumentHolder.centerText": "Au centre", "PE.Views.DocumentHolder.columnText": "Colonne", "PE.Views.DocumentHolder.deleteColumnText": "Supprimer la colonne", "PE.Views.DocumentHolder.deleteRowText": "Supprimer la ligne", @@ -277,9 +618,11 @@ "PE.Views.DocumentHolder.insertRowBelowText": "Ligne en dessous", "PE.Views.DocumentHolder.insertRowText": "Insérer une ligne", "PE.Views.DocumentHolder.insertText": "Insérer", + "PE.Views.DocumentHolder.leftText": "A gauche", "PE.Views.DocumentHolder.mergeCellsText": "Fusionner les cellules", "PE.Views.DocumentHolder.originalSizeText": "Taille par défaut", "PE.Views.DocumentHolder.removeHyperlinkText": "Supprimer le lien hypertexte", + "PE.Views.DocumentHolder.rightText": "A droite", "PE.Views.DocumentHolder.rowText": "Ligne", "PE.Views.DocumentHolder.selectText": "Sélectionner", "PE.Views.DocumentHolder.splitCellsText": "Fractionner la cellule...", @@ -303,25 +646,95 @@ "PE.Views.DocumentHolder.textSlideSettings": "Paramètres de la diapositive", "PE.Views.DocumentHolder.tipIsLocked": "Cet élément est en cours d'édition par un autre utilisateur.", "PE.Views.DocumentHolder.topCellText": "Aligner en haut", + "PE.Views.DocumentHolder.txtAddBottom": "Ajouter bordure inférieure", + "PE.Views.DocumentHolder.txtAddFractionBar": "Ajouter barre de fraction", + "PE.Views.DocumentHolder.txtAddHor": "Ajouter une ligne horizontale", + "PE.Views.DocumentHolder.txtAddLB": "Ajouter une ligne en bas à gauche", + "PE.Views.DocumentHolder.txtAddLeft": "Ajouter bordure gauche", + "PE.Views.DocumentHolder.txtAddLT": "Ajouter une ligne supérieure gauche", + "PE.Views.DocumentHolder.txtAddRight": "Ajouter bordure droite", + "PE.Views.DocumentHolder.txtAddTop": "Ajouter bordure supérieure", + "PE.Views.DocumentHolder.txtAddVer": "Ajouter une ligne verticale", "PE.Views.DocumentHolder.txtAlign": "Aligner", + "PE.Views.DocumentHolder.txtAlignToChar": "Aligner à caractère", "PE.Views.DocumentHolder.txtArrange": "Organiser", "PE.Views.DocumentHolder.txtBackground": "Arrière-plan", + "PE.Views.DocumentHolder.txtBorderProps": "Propriétés de la bordure", + "PE.Views.DocumentHolder.txtBottom": "En bas", "PE.Views.DocumentHolder.txtChangeLayout": "Modifier la disposition", + "PE.Views.DocumentHolder.txtColumnAlign": "L'alignement de la colonne", + "PE.Views.DocumentHolder.txtDecreaseArg": "Diminuer la taille de l'argument", + "PE.Views.DocumentHolder.txtDeleteArg": "Supprimer l'argument", + "PE.Views.DocumentHolder.txtDeleteBreak": "Supprimer un saut manuel", + "PE.Views.DocumentHolder.txtDeleteChars": "Supprimer caractères enserrant", + "PE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Supprimer caractères et séparateurs qui entourent", + "PE.Views.DocumentHolder.txtDeleteEq": "Supprimer l'équation", + "PE.Views.DocumentHolder.txtDeleteGroupChar": "Supprimer caractère", + "PE.Views.DocumentHolder.txtDeleteRadical": "Supprimer radical", "PE.Views.DocumentHolder.txtDeleteSlide": "Supprimer la diapositive", "PE.Views.DocumentHolder.txtDistribHor": "Distribuer horizontalement", "PE.Views.DocumentHolder.txtDistribVert": "Distribuer verticalement", "PE.Views.DocumentHolder.txtDuplicateSlide": "Dupliquer la diapositive", + "PE.Views.DocumentHolder.txtFractionLinear": "Remplacer par une fraction sur une ligne", + "PE.Views.DocumentHolder.txtFractionSkewed": "Remplacer par une fraction oblique", + "PE.Views.DocumentHolder.txtFractionStacked": "Remplacer par une fraction sur deux lignes", "PE.Views.DocumentHolder.txtGroup": "Grouper", + "PE.Views.DocumentHolder.txtGroupCharOver": "Char au-dessus du texte", + "PE.Views.DocumentHolder.txtGroupCharUnder": "Char en-dessus du texte", + "PE.Views.DocumentHolder.txtHideBottom": "Masquer bordure inférieure", + "PE.Views.DocumentHolder.txtHideBottomLimit": "Cacher limite inférieure", + "PE.Views.DocumentHolder.txtHideCloseBracket": "Cacher le crochet de fermeture", + "PE.Views.DocumentHolder.txtHideDegree": "Cacher degré", + "PE.Views.DocumentHolder.txtHideHor": "Cacher ligne horizontale", + "PE.Views.DocumentHolder.txtHideLB": "Cacher la ligne en bas à gauche", + "PE.Views.DocumentHolder.txtHideLeft": "Cacher la bordure gauche", + "PE.Views.DocumentHolder.txtHideLT": "Cacher la ligne en haut à gauche", + "PE.Views.DocumentHolder.txtHideOpenBracket": "Cacher crochet d'ouverture", + "PE.Views.DocumentHolder.txtHidePlaceholder": "Cacher espace réservé", + "PE.Views.DocumentHolder.txtHideRight": "Cacher bordure droite", + "PE.Views.DocumentHolder.txtHideTop": "Cacher bordure supérieure", + "PE.Views.DocumentHolder.txtHideTopLimit": "Cacher limite supérieure", + "PE.Views.DocumentHolder.txtHideVer": "Cacher ligne verticale", + "PE.Views.DocumentHolder.txtIncreaseArg": "Augmenter la taille de l'argument", + "PE.Views.DocumentHolder.txtInsertArgAfter": "Insérer l'argument après", + "PE.Views.DocumentHolder.txtInsertArgBefore": "Insérer un argument avant", + "PE.Views.DocumentHolder.txtInsertBreak": "Insérer pause manuelle", + "PE.Views.DocumentHolder.txtInsertEqAfter": "Insérer équation après", + "PE.Views.DocumentHolder.txtInsertEqBefore": "Insérer l'équation avant", + "PE.Views.DocumentHolder.txtLimitChange": "Modifier l'emplacement des limites", + "PE.Views.DocumentHolder.txtLimitOver": "Limite au-dessous du texte", + "PE.Views.DocumentHolder.txtLimitUnder": "Limite en dessous du texte", + "PE.Views.DocumentHolder.txtMatchBrackets": "Egaler crochets à la hauteur de l'argument", + "PE.Views.DocumentHolder.txtMatrixAlign": "Alignement de la matrice", "PE.Views.DocumentHolder.txtNewSlide": "Nouvelle diapositive", + "PE.Views.DocumentHolder.txtOverbar": "Barre au-dessus d'un texte", "PE.Views.DocumentHolder.txtPressLink": "Appuyez sur Ctrl et cliquez sur le lien", - "PE.Views.DocumentHolder.txtPreview": "Aperçu", + "PE.Views.DocumentHolder.txtPreview": "Démarrer le diaporama", + "PE.Views.DocumentHolder.txtRemFractionBar": "Supprimer la barre de fraction", + "PE.Views.DocumentHolder.txtRemLimit": "Supprimer la limite", + "PE.Views.DocumentHolder.txtRemoveAccentChar": "Supprimer le caractère d'accent", + "PE.Views.DocumentHolder.txtRemoveBar": "Supprimer la barre", + "PE.Views.DocumentHolder.txtRemScripts": "Supprimer scripts", + "PE.Views.DocumentHolder.txtRemSubscript": "Supprimer la souscription", + "PE.Views.DocumentHolder.txtRemSuperscript": "Supprimer la suscription", + "PE.Views.DocumentHolder.txtScriptsAfter": "Scripts après le texte", + "PE.Views.DocumentHolder.txtScriptsBefore": "Scripts avant le texte", "PE.Views.DocumentHolder.txtSelectAll": "Sélectionner tout", + "PE.Views.DocumentHolder.txtShowBottomLimit": "Montrer limite inférieure", + "PE.Views.DocumentHolder.txtShowCloseBracket": "Afficher crochet de fermeture", + "PE.Views.DocumentHolder.txtShowDegree": "Afficher degré", + "PE.Views.DocumentHolder.txtShowOpenBracket": "Afficher crochet d'ouverture", + "PE.Views.DocumentHolder.txtShowPlaceholder": "Afficher espace réservé", + "PE.Views.DocumentHolder.txtShowTopLimit": "Afficher limite supérieure", "PE.Views.DocumentHolder.txtSlide": "Diapositive", + "PE.Views.DocumentHolder.txtStretchBrackets": "Allonger des crochets", + "PE.Views.DocumentHolder.txtTop": "En haut", + "PE.Views.DocumentHolder.txtUnderbar": "Barre en dessous d'un texte", "PE.Views.DocumentHolder.txtUngroup": "Dissocier", "PE.Views.DocumentHolder.vertAlignText": "Alignement vertical", "PE.Views.DocumentPreview.goToSlideText": "Atteindre la diapositive", "PE.Views.DocumentPreview.slideIndexText": "Diapositive {0} de {1}", - "PE.Views.DocumentPreview.txtClose": "Fermer l'aperçu", + "PE.Views.DocumentPreview.txtClose": "Fermer le diaporama", "PE.Views.DocumentPreview.txtExitFullScreen": "Quitter le mode plein écran", "PE.Views.DocumentPreview.txtFinalMessage": "La fin de l'aperçu de la diapositive. Cliquez pour quitter.", "PE.Views.DocumentPreview.txtFullScreen": "Plein écran", @@ -332,12 +745,14 @@ "PE.Views.DocumentPreview.txtPrev": "Diapositive précédente", "PE.Views.FileMenu.btnAboutCaption": "A propos", "PE.Views.FileMenu.btnBackCaption": "Aller aux Documents", + "PE.Views.FileMenu.btnCloseMenuCaption": "Fermer le menu", "PE.Views.FileMenu.btnCreateNewCaption": "Créer nouveau", "PE.Views.FileMenu.btnDownloadCaption": "Télécharger comme...", "PE.Views.FileMenu.btnHelpCaption": "Aide...", "PE.Views.FileMenu.btnInfoCaption": "Descriptif...", "PE.Views.FileMenu.btnPrintCaption": "Imprimer", "PE.Views.FileMenu.btnRecentFilesCaption": "Ouvrir récent...", + "PE.Views.FileMenu.btnRenameCaption": "Renommer...", "PE.Views.FileMenu.btnReturnCaption": "Retour à la présentation", "PE.Views.FileMenu.btnRightsCaption": "Droits d'accès...", "PE.Views.FileMenu.btnSaveAsCaption": "Enregistrer sous", @@ -381,8 +796,8 @@ "PE.Views.FileMenuPanels.Settings.textMinute": "Chaque minute", "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.txtFitSlide": "Ajuster à la diapositive", + "PE.Views.FileMenuPanels.Settings.txtFitWidth": "Ajuster à la largeur", "PE.Views.FileMenuPanels.Settings.txtInch": "Pouce", "PE.Views.FileMenuPanels.Settings.txtInput": "Entrée alternative", "PE.Views.FileMenuPanels.Settings.txtLast": "Derniers", @@ -650,10 +1065,10 @@ "PE.Views.Statusbar.goToPageText": "Atteindre la diapositive", "PE.Views.Statusbar.pageIndexText": "Diapositive {0} de {1}", "PE.Views.Statusbar.tipAccessRights": "Gérez des droits d'accès aux documents ", - "PE.Views.Statusbar.tipFitPage": "Ajuster la diapositive", + "PE.Views.Statusbar.tipFitPage": "Ajuster à la diapositive", "PE.Views.Statusbar.tipFitWidth": "Ajuster à la largeur", "PE.Views.Statusbar.tipMoreUsers": "et %1 utilisateurs.", - "PE.Views.Statusbar.tipPreview": "Start Preview", + "PE.Views.Statusbar.tipPreview": "Démarrer le diaporama", "PE.Views.Statusbar.tipShowUsers": "Pour voir tous les utilisateurs cliquez sur l'icône au-dessous", "PE.Views.Statusbar.tipUsers": "Document est en cours d'édition par plusieurs utilisateurs.", "PE.Views.Statusbar.tipViewUsers": "Voyez les utilisateurs et gérez des droits d'accès aux documents ", @@ -779,7 +1194,7 @@ "PE.Views.Toolbar.textCancel": "Annuler", "PE.Views.Toolbar.textColumn": "Histogramme", "PE.Views.Toolbar.textCompactView": "Afficher la barre d'outils compacte", - "PE.Views.Toolbar.textFitPage": "Ajuster la diapositive", + "PE.Views.Toolbar.textFitPage": "Ajuster à la diapositive", "PE.Views.Toolbar.textFitWidth": "Ajuster à la largeur", "PE.Views.Toolbar.textHideLines": "Masquer les règles", "PE.Views.Toolbar.textHideStatusBar": "Masquer la barre d'état", @@ -824,6 +1239,7 @@ "PE.Views.Toolbar.tipHideBars": "Masquer la barre de titre et la barre d'état", "PE.Views.Toolbar.tipIncPrLeft": "Augmenter le retrait", "PE.Views.Toolbar.tipInsertChart": "Insérer un graphique", + "PE.Views.Toolbar.tipInsertEquation": "Insérer une équation", "PE.Views.Toolbar.tipInsertHyperlink": "Ajouter un lien hypertexte", "PE.Views.Toolbar.tipInsertImage": "Insérer une image", "PE.Views.Toolbar.tipInsertShape": "Insérer une forme automatique", @@ -835,7 +1251,7 @@ "PE.Views.Toolbar.tipNumbers": "Numérotation", "PE.Views.Toolbar.tipOpenDocument": "Ouvrir présentation", "PE.Views.Toolbar.tipPaste": "Coller", - "PE.Views.Toolbar.tipPreview": "Démarrer l'affichage de l'aperçu", + "PE.Views.Toolbar.tipPreview": "Démarrer le diaporama", "PE.Views.Toolbar.tipPrint": "Imprimer", "PE.Views.Toolbar.tipRedo": "Rétablir", "PE.Views.Toolbar.tipSave": "Enregistrer", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index 49a50d198..8581debd5 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -74,6 +74,8 @@ "Common.Views.DocumentAccessDialog.textTitle": "Paramètres de partage", "Common.Views.Header.openNewTabText": "Ouvrir dans un nouvel onglet", "Common.Views.Header.textBack": "Aller aux Documents", + "Common.Views.Header.txtHeaderDeveloper": "MODE DEVELOPPEUR", + "Common.Views.Header.txtRename": "Renommer", "Common.Views.ImageFromUrlDialog.cancelButtonText": "Annuler", "Common.Views.ImageFromUrlDialog.okButtonText": "OK", "Common.Views.ImageFromUrlDialog.textUrl": "Coller URL d'image", @@ -83,18 +85,34 @@ "Common.Views.OpenDialog.okButtonText": "OK", "Common.Views.OpenDialog.txtDelimiter": "Délimiteur", "Common.Views.OpenDialog.txtEncoding": "Encodage", - "Common.Views.OpenDialog.txtPassword": "Password", + "Common.Views.OpenDialog.txtPassword": "Mot de passe", "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.OpenDialog.txtTitleProtected": "Fichier protégé", + "Common.Views.PluginDlg.textLoading": "Chargement", "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.", + "Common.Views.Plugins.textLoading": "Chargement", + "Common.Views.Plugins.textStart": "Démarrer", + "Common.Views.RenameDialog.cancelButtonText": "Annuler", + "Common.Views.RenameDialog.okButtonText": "Ok", + "Common.Views.RenameDialog.textName": "Nom de fichier", + "Common.Views.RenameDialog.txtInvalidName": "Un nom de fichier ne peut pas contenir les caractères suivants :", + "SSE.Controllers.DocumentHolder.alignmentText": "Alignement", + "SSE.Controllers.DocumentHolder.centerText": "Au centre", + "SSE.Controllers.DocumentHolder.deleteColumnText": "Supprimer la colonne", + "SSE.Controllers.DocumentHolder.deleteRowText": "Supprimer la ligne", + "SSE.Controllers.DocumentHolder.deleteText": "Supprimer", + "SSE.Controllers.DocumentHolder.errorInvalidLink": "Le lien de référence n'existe pas. Veuillez corriger la référence ou la supprimer.", "SSE.Controllers.DocumentHolder.guestText": "Invité", - "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning", + "SSE.Controllers.DocumentHolder.insertColumnLeftText": "Colonne à gauche", + "SSE.Controllers.DocumentHolder.insertColumnRightText": "Colonne à droite", + "SSE.Controllers.DocumentHolder.insertRowAboveText": "Ligne au-dessus", + "SSE.Controllers.DocumentHolder.insertRowBelowText": "Ligne en dessous", + "SSE.Controllers.DocumentHolder.insertText": "Insérer", + "SSE.Controllers.DocumentHolder.leftText": "A gauche", + "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Avertissement", + "SSE.Controllers.DocumentHolder.rightText": "A droite", "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", @@ -102,8 +120,78 @@ "SSE.Controllers.DocumentHolder.textInsertTop": "Insérer haut", "SSE.Controllers.DocumentHolder.textSym": "sym", "SSE.Controllers.DocumentHolder.tipIsLocked": "Cet élément est en cours de modification par un autre utilisateur.", + "SSE.Controllers.DocumentHolder.txtAddBottom": "Ajouter bordure inférieure", + "SSE.Controllers.DocumentHolder.txtAddFractionBar": "Ajouter barre de fraction", + "SSE.Controllers.DocumentHolder.txtAddHor": "Ajouter une ligne horizontale", + "SSE.Controllers.DocumentHolder.txtAddLB": "Ajouter une ligne en bas à gauche", + "SSE.Controllers.DocumentHolder.txtAddLeft": "Ajouter bordure gauche", + "SSE.Controllers.DocumentHolder.txtAddLT": "Ajouter une ligne supérieure gauche", + "SSE.Controllers.DocumentHolder.txtAddRight": "Ajouter bordure droite", + "SSE.Controllers.DocumentHolder.txtAddTop": "Ajouter bordure supérieure", + "SSE.Controllers.DocumentHolder.txtAddVer": "Ajouter une ligne verticale", + "SSE.Controllers.DocumentHolder.txtAlignToChar": "Aligner à caractère", + "SSE.Controllers.DocumentHolder.txtBorderProps": "Propriétés de bordure", + "SSE.Controllers.DocumentHolder.txtBottom": "En bas", + "SSE.Controllers.DocumentHolder.txtColumnAlign": "L'alignement de la colonne", + "SSE.Controllers.DocumentHolder.txtDecreaseArg": "Diminuer la taille de l'argument", + "SSE.Controllers.DocumentHolder.txtDeleteArg": "Supprimer l'argument", + "SSE.Controllers.DocumentHolder.txtDeleteBreak": "Supprimer le saut manuel", + "SSE.Controllers.DocumentHolder.txtDeleteChars": "Supprimer caractères enserrant", + "SSE.Controllers.DocumentHolder.txtDeleteCharsAndSeparators": "Supprimer caractères et séparateurs qui entourent", + "SSE.Controllers.DocumentHolder.txtDeleteEq": "Supprimer l'équation", + "SSE.Controllers.DocumentHolder.txtDeleteGroupChar": "Supprimer caractère", + "SSE.Controllers.DocumentHolder.txtDeleteRadical": "Supprimer radical", + "SSE.Controllers.DocumentHolder.txtFractionLinear": "Remplacer par une fraction sur une ligne", + "SSE.Controllers.DocumentHolder.txtFractionSkewed": "Remplacer par une fraction oblique", + "SSE.Controllers.DocumentHolder.txtFractionStacked": "Remplacer par une fraction sur deux lignes", + "SSE.Controllers.DocumentHolder.txtGroupCharOver": "Char au-dessus du texte", + "SSE.Controllers.DocumentHolder.txtGroupCharUnder": "Char en-dessus du texte", "SSE.Controllers.DocumentHolder.txtHeight": "Hauteur", + "SSE.Controllers.DocumentHolder.txtHideBottom": "Masquer bordure inférieure", + "SSE.Controllers.DocumentHolder.txtHideBottomLimit": "Cacher limite inférieure", + "SSE.Controllers.DocumentHolder.txtHideCloseBracket": "Cacher le crochet de fermeture", + "SSE.Controllers.DocumentHolder.txtHideDegree": "Cacher degré", + "SSE.Controllers.DocumentHolder.txtHideHor": "Cacher ligne horizontale", + "SSE.Controllers.DocumentHolder.txtHideLB": "Cacher la ligne en bas à gauche", + "SSE.Controllers.DocumentHolder.txtHideLeft": "Cacher bordure gauche", + "SSE.Controllers.DocumentHolder.txtHideLT": "Cacher la ligne en haut à gauche", + "SSE.Controllers.DocumentHolder.txtHideOpenBracket": "Cacher crochet d'ouverture", + "SSE.Controllers.DocumentHolder.txtHidePlaceholder": "Cacher espace réservé", + "SSE.Controllers.DocumentHolder.txtHideRight": "Cacher bordure droite", + "SSE.Controllers.DocumentHolder.txtHideTop": "Cacher bordure supérieure", + "SSE.Controllers.DocumentHolder.txtHideTopLimit": "Cacher limite supérieure", + "SSE.Controllers.DocumentHolder.txtHideVer": "Cacher ligne verticale", + "SSE.Controllers.DocumentHolder.txtIncreaseArg": "Augmenter la taille de l'argument", + "SSE.Controllers.DocumentHolder.txtInsertArgAfter": "Insérez l'argument après", + "SSE.Controllers.DocumentHolder.txtInsertArgBefore": "Insérer argument devant", + "SSE.Controllers.DocumentHolder.txtInsertBreak": "Insérer pause manuelle", + "SSE.Controllers.DocumentHolder.txtInsertEqAfter": "Insérer équation après", + "SSE.Controllers.DocumentHolder.txtInsertEqBefore": "Insérer l'équation avant", + "SSE.Controllers.DocumentHolder.txtLimitChange": "Modifier l'emplacement des limites", + "SSE.Controllers.DocumentHolder.txtLimitOver": "Limite au-dessous du texte", + "SSE.Controllers.DocumentHolder.txtLimitUnder": "Limite en dessous du texte", + "SSE.Controllers.DocumentHolder.txtMatchBrackets": "Egaler crochets à la hauteur de l'argument", + "SSE.Controllers.DocumentHolder.txtMatrixAlign": "Alignement de la matrice", + "SSE.Controllers.DocumentHolder.txtOverbar": "Barre au-dessus d'un texte", + "SSE.Controllers.DocumentHolder.txtRemFractionBar": "Supprimer la barre de fraction", + "SSE.Controllers.DocumentHolder.txtRemLimit": "Supprimer la limite", + "SSE.Controllers.DocumentHolder.txtRemoveAccentChar": "Supprimer le caractère d'accent", + "SSE.Controllers.DocumentHolder.txtRemoveBar": "Supprimer la barre", + "SSE.Controllers.DocumentHolder.txtRemScripts": "Supprimer scripts", + "SSE.Controllers.DocumentHolder.txtRemSubscript": "Supprimer la souscription", + "SSE.Controllers.DocumentHolder.txtRemSuperscript": "Supprimer la suscription", "SSE.Controllers.DocumentHolder.txtRowHeight": "Hauteur de ligne", + "SSE.Controllers.DocumentHolder.txtScriptsAfter": "Scripts après le texte", + "SSE.Controllers.DocumentHolder.txtScriptsBefore": "Scripts avant le texte", + "SSE.Controllers.DocumentHolder.txtShowBottomLimit": "Montrer limite inférieure", + "SSE.Controllers.DocumentHolder.txtShowCloseBracket": "Afficher crochet de fermeture", + "SSE.Controllers.DocumentHolder.txtShowDegree": "Afficher degré", + "SSE.Controllers.DocumentHolder.txtShowOpenBracket": "Afficher crochet d'ouverture", + "SSE.Controllers.DocumentHolder.txtShowPlaceholder": "Afficher espace réservé", + "SSE.Controllers.DocumentHolder.txtShowTopLimit": "Afficher limite supérieure", + "SSE.Controllers.DocumentHolder.txtStretchBrackets": "Allonger des crochets", + "SSE.Controllers.DocumentHolder.txtTop": "En haut", + "SSE.Controllers.DocumentHolder.txtUnderbar": "Barre en dessous d'un texte", "SSE.Controllers.DocumentHolder.txtWidth": "Largeur", "SSE.Controllers.LeftMenu.newDocumentTitle": "Feuille de calcul sans nom", "SSE.Controllers.LeftMenu.textByColumns": "Par colonnes", @@ -122,8 +210,7 @@ "SSE.Controllers.LeftMenu.textWorkbook": "Classeur", "SSE.Controllers.LeftMenu.warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.
Êtes-vous sûr de vouloir continuer ?", "SSE.Controllers.Main.confirmMoveCellRange": "La plage de cellules finale peut contenir des données.Voulez-vous continuer ?", - "SSE.Controllers.Main.confirmPutMergeRange": "Les données source contient des cellules fusionnées.
Ils seront fusionnés avant qu'ils ne soient transmis dans la tableau.", - "SSE.Controllers.Main.convertationErrorText": "Échec de la conversion.", + "SSE.Controllers.Main.confirmPutMergeRange": "Les données source contenaient des cellules fusionnées.
La fusion a été supprimée avant la transmission des cellules dans le tableau.", "SSE.Controllers.Main.convertationTimeoutText": "Expiration du délai de conversion.", "SSE.Controllers.Main.criticalErrorExtText": "Cliquez sur \"OK\" pour revenir à la liste des documents.", "SSE.Controllers.Main.criticalErrorTitle": "Erreur", @@ -139,6 +226,7 @@ "SSE.Controllers.Main.errorBadImageUrl": "L'URL d'image est incorrecte", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Connexion au serveur perdue. Le document ne peut être modifié en ce moment.", "SSE.Controllers.Main.errorConnectToServer": "Le document n'a pas pu être enregistré. Veuillez vérifier les paramètres de connexion ou contactez votre administrateur.
Lorsque vous cliquez sur le bouton 'OK', vous serez invité à télécharger le document.

Trouvez plus d'informations sur la connexion Document Serverhere", + "SSE.Controllers.Main.errorCopyMultiselectArea": "Impossible d'exécuter cette commande sur des sélections multiples.
Sélectionnez une seule plage et essayez à nouveau.", "SSE.Controllers.Main.errorCountArg": "Une erreur dans la formule entrée.
Nombre d'arguments utilisé est incorrect.", "SSE.Controllers.Main.errorCountArgExceed": "Une erreur dans la formule entrée.
Nombre d'arguments est dépassé.", "SSE.Controllers.Main.errorCreateDefName": "Actuellement des plages nommées existantes ne peuvent pas être modifiées et les nouvelles ne peuvent pas être
créées car certaines d'entre eux sont en cours de modification.", @@ -159,7 +247,7 @@ "SSE.Controllers.Main.errorLockedWorksheetRename": "La feuille ne peut pas être renommée pour l'instant puisque elle est renommée par un autre utilisateur", "SSE.Controllers.Main.errorMoveRange": "Impossible de modifier une partie d'une cellule fusionnée", "SSE.Controllers.Main.errorOpenWarning": "La longueur de l'une des formules dans le fichier dépassé le nombre autorisé de caractères et il a été retiré.", - "SSE.Controllers.Main.errorOperandExpected": "Opérande attendue", + "SSE.Controllers.Main.errorOperandExpected": "La syntaxe de la saisie est incorrecte. Veuillez vérifier si l'une des parenthèses - '(' ou ')' est manquante.", "SSE.Controllers.Main.errorPasteMaxRange": "La zone de copie ne correspond pas à la zone de collage.
Pour coller les cellules copiées, veuillez sélectionner une zone avec la même taille ou cliquer sur la première cellule d'une ligne.", "SSE.Controllers.Main.errorProcessSaveResult": "Échec de l'enregistrement", "SSE.Controllers.Main.errorStockChart": "L'ordre des lignes est incorrect. Pour créer un graphique boursier organisez vos données sur la feuille de calcul dans l'ordre suivant:
cours à l'ouverture, cours maximal, cours minimal, cours à la clôture.", @@ -167,7 +255,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,
but will not be able to download or print until the connection is restored.", + "SSE.Controllers.Main.errorViewerDisconnect": "La connexion a été perdue. Vous pouvez toujours afficher le document,
mais ne pouvez pas le télécharger jusqu'à ce que la connexion soit rétablie.", "SSE.Controllers.Main.errorWrongBracketsCount": "Une erreur dans la formule entrée.
Nombre utilisé entre parenthèses est incorrect.", "SSE.Controllers.Main.errorWrongOperator": "Une erreur dans la formule entrée.
Opérateur utilisé est incorrect.
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.", @@ -181,7 +269,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.openErrorText": "Une erreur s’est produite lors de l’ouverture du fichier", "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", @@ -190,26 +278,26 @@ "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.saveErrorText": "Une erreur s'est produite lors de l'enregistrement du fichier", "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 ...", "SSE.Controllers.Main.saveTitleText": "Enregistrement de la feuille de calcul", "SSE.Controllers.Main.textAnonymous": "Anonyme", - "SSE.Controllers.Main.textBuyNow": "Visit website", + "SSE.Controllers.Main.textBuyNow": "Visiter le site web", "SSE.Controllers.Main.textCloseTip": "Cliquez pour fermer la conseil", "SSE.Controllers.Main.textConfirm": "Confirmation", - "SSE.Controllers.Main.textContactUs": "Contact sales", + "SSE.Controllers.Main.textContactUs": "Contacter l'équipe de ventes", "SSE.Controllers.Main.textLoadingDocument": "Chargement feuille de calcul", "SSE.Controllers.Main.textNo": "Non", - "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE open source version", + "SSE.Controllers.Main.textNoLicenseTitle": "La version open source de ONLYOFFICE", "SSE.Controllers.Main.textPleaseWait": "L'opération peut prendre plus de temps que prévu. Veuillez patienter...", "SSE.Controllers.Main.textRecalcFormulas": "Calcul des formules...", "SSE.Controllers.Main.textShape": "Forme", "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.
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.titleLicenseExp": "Licence expirée", "SSE.Controllers.Main.titleRecalcFormulas": "Calcul en cours...", "SSE.Controllers.Main.txtArt": "Votre texte ici", "SSE.Controllers.Main.txtBasicShapes": "Formes de base", @@ -235,8 +323,8 @@ "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.
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).
If you need more please consider purchasing a commercial license.", + "SSE.Controllers.Main.warnLicenseExp": "Votre licence a expiré.
Veuillez mettre à jour votre licence et actualisez la page.", + "SSE.Controllers.Main.warnNoLicense": "Vous utilisez la version open source de ONLYOFFICE. La version a des limitations en connexions simultanées au serveur de documents (20 connexions à la fois).
Pour en avoir plus, veuillez envisager l'achat d'une licence commerciale.", "SSE.Controllers.Main.warnProcessRightsChange": "Le droit d'édition du fichier vous a été refusé.", "SSE.Controllers.Print.strAllSheets": "Toutes les feuilles", "SSE.Controllers.Print.textWarning": "Avertissement", @@ -247,9 +335,337 @@ "SSE.Controllers.Statusbar.warnDeleteSheet": "La feuille de travail peut contenir des données. Êtes-vous sûr de vouloir continuer ?", "SSE.Controllers.Statusbar.zoomText": "Zoom {0}%", "SSE.Controllers.Toolbar.confirmAddFontName": "La police que vous allez enregistrer n'est pas disponible sur l'appareil actuel.
Le style du texte sera affiché à l'aide de l'une des polices de système, la police sauvée sera utilisée lorsqu'il est disponible.
Voulez-vous continuer?", + "SSE.Controllers.Toolbar.textAccent": "Types d'accentuation", + "SSE.Controllers.Toolbar.textBracket": "Crochets", "SSE.Controllers.Toolbar.textCancel": "Annuler", "SSE.Controllers.Toolbar.textFontSizeErr": "La valeur entrée est incorrecte.
Entrez une valeur numérique entre 1 et 409", + "SSE.Controllers.Toolbar.textFraction": "Fractions", + "SSE.Controllers.Toolbar.textFunction": "Fonctions", + "SSE.Controllers.Toolbar.textIntegral": "Intégrales", + "SSE.Controllers.Toolbar.textLargeOperator": "Grands opérateurs", + "SSE.Controllers.Toolbar.textLimitAndLog": "Limites et logarithmes ", + "SSE.Controllers.Toolbar.textMatrix": "Matrices", + "SSE.Controllers.Toolbar.textOperator": "Opérateurs", + "SSE.Controllers.Toolbar.textRadical": "Radicaux", + "SSE.Controllers.Toolbar.textScript": "Scripts", + "SSE.Controllers.Toolbar.textSymbols": "Symboles", "SSE.Controllers.Toolbar.textWarning": "Avertissement", + "SSE.Controllers.Toolbar.txtAccent_Accent": "Aigu", + "SSE.Controllers.Toolbar.txtAccent_ArrowD": "Flèche gauche-droite au-dessus", + "SSE.Controllers.Toolbar.txtAccent_ArrowL": "Flèche vers la gauche au-dessus", + "SSE.Controllers.Toolbar.txtAccent_ArrowR": "Flèche vers la droite au-dessus", + "SSE.Controllers.Toolbar.txtAccent_Bar": "Barre", + "SSE.Controllers.Toolbar.txtAccent_BarBot": "Barre inférieure", + "SSE.Controllers.Toolbar.txtAccent_BarTop": "Barre supérieure", + "SSE.Controllers.Toolbar.txtAccent_BorderBox": "Formule encadrée (avec espace réservé)", + "SSE.Controllers.Toolbar.txtAccent_BorderBoxCustom": "Formule encadrée (exemple)", + "SSE.Controllers.Toolbar.txtAccent_Check": "Cocher", + "SSE.Controllers.Toolbar.txtAccent_CurveBracketBot": "Accolade inférieure", + "SSE.Controllers.Toolbar.txtAccent_CurveBracketTop": "Accolade supérieure", + "SSE.Controllers.Toolbar.txtAccent_Custom_1": "Vecteur A", + "SSE.Controllers.Toolbar.txtAccent_Custom_2": "ABC avec barre supérieure", + "SSE.Controllers.Toolbar.txtAccent_Custom_3": "x XOR y avec barre supérieure", + "SSE.Controllers.Toolbar.txtAccent_DDDot": "Point triple", + "SSE.Controllers.Toolbar.txtAccent_DDot": "Point double", + "SSE.Controllers.Toolbar.txtAccent_Dot": "Point", + "SSE.Controllers.Toolbar.txtAccent_DoubleBar": "Barre supérieure double", + "SSE.Controllers.Toolbar.txtAccent_Grave": "Grave", + "SSE.Controllers.Toolbar.txtAccent_GroupBot": "Regroupement de caractère en dessus", + "SSE.Controllers.Toolbar.txtAccent_GroupTop": "Regroupement de caractère au-dessus", + "SSE.Controllers.Toolbar.txtAccent_HarpoonL": "Harpon gauche au-dessus", + "SSE.Controllers.Toolbar.txtAccent_HarpoonR": "Harpon droite au-dessus", + "SSE.Controllers.Toolbar.txtAccent_Hat": "Chapeau", + "SSE.Controllers.Toolbar.txtAccent_Smile": "Brève", + "SSE.Controllers.Toolbar.txtAccent_Tilde": "Tilde", + "SSE.Controllers.Toolbar.txtBracket_Angle": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_Angle_Delimiter_2": "Crochets avec séparateurs", + "SSE.Controllers.Toolbar.txtBracket_Angle_Delimiter_3": "Crochets avec séparateurs", + "SSE.Controllers.Toolbar.txtBracket_Angle_NoneOpen": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_Angle_OpenNone": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_Curve": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_Curve_Delimiter_2": "Crochets avec séparateurs", + "SSE.Controllers.Toolbar.txtBracket_Curve_NoneOpen": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_Curve_OpenNone": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_Custom_1": "Cas (deux conditions)", + "SSE.Controllers.Toolbar.txtBracket_Custom_2": "Cas (trois conditions)", + "SSE.Controllers.Toolbar.txtBracket_Custom_3": "Objet empilé", + "SSE.Controllers.Toolbar.txtBracket_Custom_4": "Objet empilé", + "SSE.Controllers.Toolbar.txtBracket_Custom_5": "Exemple de cas", + "SSE.Controllers.Toolbar.txtBracket_Custom_6": "Coefficient binomial", + "SSE.Controllers.Toolbar.txtBracket_Custom_7": "Coefficient binomial", + "SSE.Controllers.Toolbar.txtBracket_Line": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_Line_NoneOpen": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_Line_OpenNone": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_LineDouble": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_LineDouble_NoneOpen": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_LineDouble_OpenNone": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_LowLim": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_LowLim_NoneNone": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_LowLim_OpenNone": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_Round": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_Round_Delimiter_2": "Crochets avec séparateurs", + "SSE.Controllers.Toolbar.txtBracket_Round_NoneOpen": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_Round_OpenNone": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_Square": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_Square_CloseClose": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_Square_CloseOpen": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_Square_NoneOpen": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_Square_OpenNone": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_Square_OpenOpen": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_SquareDouble": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_SquareDouble_NoneOpen": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_SquareDouble_OpenNone": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_UppLim": "Crochets", + "SSE.Controllers.Toolbar.txtBracket_UppLim_NoneOpen": "Crochet unique", + "SSE.Controllers.Toolbar.txtBracket_UppLim_OpenNone": "Crochet unique", + "SSE.Controllers.Toolbar.txtFractionDiagonal": "Fraction oblique", + "SSE.Controllers.Toolbar.txtFractionDifferential_1": "Différentiel", + "SSE.Controllers.Toolbar.txtFractionDifferential_2": "Différentiel", + "SSE.Controllers.Toolbar.txtFractionDifferential_3": "Différentiel", + "SSE.Controllers.Toolbar.txtFractionDifferential_4": "Différentiel", + "SSE.Controllers.Toolbar.txtFractionHorizontal": "Fraction sur une ligne", + "SSE.Controllers.Toolbar.txtFractionPi_2": "Pi divisé par 2", + "SSE.Controllers.Toolbar.txtFractionSmall": "Petite fraction", + "SSE.Controllers.Toolbar.txtFractionVertical": "Fraction sur deux lignes", + "SSE.Controllers.Toolbar.txtFunction_1_Cos": "Fonction cosinus inverse", + "SSE.Controllers.Toolbar.txtFunction_1_Cosh": "Fonction cosinus inverse hyperbolique", + "SSE.Controllers.Toolbar.txtFunction_1_Cot": "Fonction cotangente inverse", + "SSE.Controllers.Toolbar.txtFunction_1_Coth": "Fonction cotangente inverse hyperbolique", + "SSE.Controllers.Toolbar.txtFunction_1_Csc": "Fonction cosécante inverse", + "SSE.Controllers.Toolbar.txtFunction_1_Csch": "Fonction cosécante inverse hyperbolique", + "SSE.Controllers.Toolbar.txtFunction_1_Sec": "Fonction sécante inverse", + "SSE.Controllers.Toolbar.txtFunction_1_Sech": "Fonction sécante inverse hyperbolique", + "SSE.Controllers.Toolbar.txtFunction_1_Sin": "Fonction sinus inverse", + "SSE.Controllers.Toolbar.txtFunction_1_Sinh": "Fonction sinus inverse hyperbolique", + "SSE.Controllers.Toolbar.txtFunction_1_Tan": "Fonction tangente inverse", + "SSE.Controllers.Toolbar.txtFunction_1_Tanh": "Fonction tangente inverse hyperbolique", + "SSE.Controllers.Toolbar.txtFunction_Cos": "Fonction cosinus", + "SSE.Controllers.Toolbar.txtFunction_Cosh": "Fonction cosinus hyperbolique", + "SSE.Controllers.Toolbar.txtFunction_Cot": "Fonction cotangente", + "SSE.Controllers.Toolbar.txtFunction_Coth": "Fonction cotangente hyperbolique", + "SSE.Controllers.Toolbar.txtFunction_Csc": "Fonction cosécante", + "SSE.Controllers.Toolbar.txtFunction_Csch": "Fonction cosécante hyperbolique", + "SSE.Controllers.Toolbar.txtFunction_Custom_1": "Sinus thêta", + "SSE.Controllers.Toolbar.txtFunction_Custom_2": "Cosinus 2x", + "SSE.Controllers.Toolbar.txtFunction_Custom_3": "Formule de la tangente", + "SSE.Controllers.Toolbar.txtFunction_Sec": "Fonction sécante", + "SSE.Controllers.Toolbar.txtFunction_Sech": "Fonction sécante hyperbolique", + "SSE.Controllers.Toolbar.txtFunction_Sin": "Fonction sinus", + "SSE.Controllers.Toolbar.txtFunction_Sinh": "Fonction sinus hyperbolique", + "SSE.Controllers.Toolbar.txtFunction_Tan": "Formule de la tangente", + "SSE.Controllers.Toolbar.txtFunction_Tanh": "Fonction tangente hyperbolique", + "SSE.Controllers.Toolbar.txtIntegral": "Intégrale", + "SSE.Controllers.Toolbar.txtIntegral_dtheta": "Thêta différentiel", + "SSE.Controllers.Toolbar.txtIntegral_dx": "Différentiel x", + "SSE.Controllers.Toolbar.txtIntegral_dy": "Différentiel y", + "SSE.Controllers.Toolbar.txtIntegralCenterSubSup": "Intégrale", + "SSE.Controllers.Toolbar.txtIntegralDouble": "Double intégrale", + "SSE.Controllers.Toolbar.txtIntegralDoubleCenterSubSup": "Double intégrale", + "SSE.Controllers.Toolbar.txtIntegralDoubleSubSup": "Double intégrale", + "SSE.Controllers.Toolbar.txtIntegralOriented": "Intégrale de contour", + "SSE.Controllers.Toolbar.txtIntegralOrientedCenterSubSup": "Intégrale de contour", + "SSE.Controllers.Toolbar.txtIntegralOrientedDouble": "Intégrale de surface", + "SSE.Controllers.Toolbar.txtIntegralOrientedDoubleCenterSubSup": "Intégrale de surface", + "SSE.Controllers.Toolbar.txtIntegralOrientedDoubleSubSup": "Intégrale de surface", + "SSE.Controllers.Toolbar.txtIntegralOrientedSubSup": "Intégrale de contour", + "SSE.Controllers.Toolbar.txtIntegralOrientedTriple": "Intégrale de volume", + "SSE.Controllers.Toolbar.txtIntegralOrientedTripleCenterSubSup": "Intégrale de volume", + "SSE.Controllers.Toolbar.txtIntegralOrientedTripleSubSup": "Intégrale de volume", + "SSE.Controllers.Toolbar.txtIntegralSubSup": "Intégrale", + "SSE.Controllers.Toolbar.txtIntegralTriple": "Triple intégrale", + "SSE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Triple intégrale", + "SSE.Controllers.Toolbar.txtIntegralTripleSubSup": "Triple intégrale", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Coin", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Coin", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Coin", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Coin", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Coin", + "SSE.Controllers.Toolbar.txtLargeOperator_CoProd": "Co-produit", + "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Co-produit", + "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Co-produit", + "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Co-produit", + "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Co-produit", + "SSE.Controllers.Toolbar.txtLargeOperator_Custom_1": "Somme", + "SSE.Controllers.Toolbar.txtLargeOperator_Custom_2": "Somme", + "SSE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Somme", + "SSE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Produit", + "SSE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Union", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction": "en V", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "en V", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "en V", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "en V", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "en V", + "SSE.Controllers.Toolbar.txtLargeOperator_Intersection": "Intersection", + "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSub": "Intersection", + "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSubSup": "Intersection", + "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_Sub": "Intersection", + "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_SubSup": "Intersection", + "SSE.Controllers.Toolbar.txtLargeOperator_Prod": "Produit", + "SSE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSub": "Produit", + "SSE.Controllers.Toolbar.txtLargeOperator_Prod_CenterSubSup": "Produit", + "SSE.Controllers.Toolbar.txtLargeOperator_Prod_Sub": "Produit", + "SSE.Controllers.Toolbar.txtLargeOperator_Prod_SubSup": "Produit", + "SSE.Controllers.Toolbar.txtLargeOperator_Sum": "Somme", + "SSE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSub": "Somme", + "SSE.Controllers.Toolbar.txtLargeOperator_Sum_CenterSubSup": "Somme", + "SSE.Controllers.Toolbar.txtLargeOperator_Sum_Sub": "Somme", + "SSE.Controllers.Toolbar.txtLargeOperator_Sum_SubSup": "Somme", + "SSE.Controllers.Toolbar.txtLargeOperator_Union": "Union", + "SSE.Controllers.Toolbar.txtLargeOperator_Union_CenterSub": "Union", + "SSE.Controllers.Toolbar.txtLargeOperator_Union_CenterSubSup": "Union", + "SSE.Controllers.Toolbar.txtLargeOperator_Union_Sub": "Union", + "SSE.Controllers.Toolbar.txtLargeOperator_Union_SubSup": "Union", + "SSE.Controllers.Toolbar.txtLimitLog_Custom_1": "Exemple de limite", + "SSE.Controllers.Toolbar.txtLimitLog_Custom_2": "Exemple de maximum", + "SSE.Controllers.Toolbar.txtLimitLog_Lim": "Limite", + "SSE.Controllers.Toolbar.txtLimitLog_Ln": "Logarithme naturel", + "SSE.Controllers.Toolbar.txtLimitLog_Log": "Logarithme", + "SSE.Controllers.Toolbar.txtLimitLog_LogBase": "Logarithme", + "SSE.Controllers.Toolbar.txtLimitLog_Max": "Maximum", + "SSE.Controllers.Toolbar.txtLimitLog_Min": "Minimum", + "SSE.Controllers.Toolbar.txtMatrix_1_2": "Matrice vide 1x2 ", + "SSE.Controllers.Toolbar.txtMatrix_1_3": "Matrice vide 1x3", + "SSE.Controllers.Toolbar.txtMatrix_2_1": "Matrice vide 2x1", + "SSE.Controllers.Toolbar.txtMatrix_2_2": "Matrice vide 2x2", + "SSE.Controllers.Toolbar.txtMatrix_2_2_DLineBracket": "Matrice vide avec crochets", + "SSE.Controllers.Toolbar.txtMatrix_2_2_LineBracket": "Matrice vide avec crochets", + "SSE.Controllers.Toolbar.txtMatrix_2_2_RoundBracket": "Matrice vide avec crochets", + "SSE.Controllers.Toolbar.txtMatrix_2_2_SquareBracket": "Matrice vide avec crochets", + "SSE.Controllers.Toolbar.txtMatrix_2_3": "Matrice vide 2x3", + "SSE.Controllers.Toolbar.txtMatrix_3_1": "Matrice vide 3x1", + "SSE.Controllers.Toolbar.txtMatrix_3_2": "Matrice vide 3x2", + "SSE.Controllers.Toolbar.txtMatrix_3_3": "Matrice vide 3x3", + "SSE.Controllers.Toolbar.txtMatrix_Dots_Baseline": "Points de ligne de base", + "SSE.Controllers.Toolbar.txtMatrix_Dots_Center": "Points d'interligne", + "SSE.Controllers.Toolbar.txtMatrix_Dots_Diagonal": "Points diagonaux", + "SSE.Controllers.Toolbar.txtMatrix_Dots_Vertical": "Points verticaux", + "SSE.Controllers.Toolbar.txtMatrix_Flat_Round": "Matrice avec pointillés", + "SSE.Controllers.Toolbar.txtMatrix_Flat_Square": "Matrice avec pointillés", + "SSE.Controllers.Toolbar.txtMatrix_Identity_2": "Matrice d'identité 2x2", + "SSE.Controllers.Toolbar.txtMatrix_Identity_2_NoZeros": "Matrice d'identité 3x3", + "SSE.Controllers.Toolbar.txtMatrix_Identity_3": "Matrice d'identité 3x3", + "SSE.Controllers.Toolbar.txtMatrix_Identity_3_NoZeros": "Matrice d'identité 3x3", + "SSE.Controllers.Toolbar.txtOperator_ArrowD_Bot": "Flèche gauche-droite en dessous", + "SSE.Controllers.Toolbar.txtOperator_ArrowD_Top": "Flèche gauche-droite au-dessus", + "SSE.Controllers.Toolbar.txtOperator_ArrowL_Bot": "Flèche vers la gauche en dessous", + "SSE.Controllers.Toolbar.txtOperator_ArrowL_Top": "Flèche vers la gauche au-dessus", + "SSE.Controllers.Toolbar.txtOperator_ArrowR_Bot": "Flèche vers la droite en dessous", + "SSE.Controllers.Toolbar.txtOperator_ArrowR_Top": "Flèche vers la droite au-dessus", + "SSE.Controllers.Toolbar.txtOperator_ColonEquals": "Deux-points Égal", + "SSE.Controllers.Toolbar.txtOperator_Custom_1": "Produits", + "SSE.Controllers.Toolbar.txtOperator_Custom_2": "Produits delta", + "SSE.Controllers.Toolbar.txtOperator_Definition": "Égal par définition à", + "SSE.Controllers.Toolbar.txtOperator_DeltaEquals": "Delta égal à", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowD_Bot": "Flèche gauche-droite en dessous", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowD_Top": "Flèche gauche-droite au-dessus", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowL_Bot": "Flèche vers la gauche en dessous", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowL_Top": "Flèche vers la gauche au-dessus", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowR_Bot": "Flèche vers la droite en dessous", + "SSE.Controllers.Toolbar.txtOperator_DoubleArrowR_Top": "Flèche vers la droite au-dessus", + "SSE.Controllers.Toolbar.txtOperator_EqualsEquals": "Égal Égal", + "SSE.Controllers.Toolbar.txtOperator_MinusEquals": "Moins égal", + "SSE.Controllers.Toolbar.txtOperator_PlusEquals": "Plus Égal", + "SSE.Controllers.Toolbar.txtOperator_UnitOfMeasure": "Mesuré(e) par", + "SSE.Controllers.Toolbar.txtRadicalCustom_1": "Radical", + "SSE.Controllers.Toolbar.txtRadicalCustom_2": "Radical", + "SSE.Controllers.Toolbar.txtRadicalRoot_2": "Racine carrée avec degré", + "SSE.Controllers.Toolbar.txtRadicalRoot_3": "Racine cubique", + "SSE.Controllers.Toolbar.txtRadicalRoot_n": "Radical avec degré", + "SSE.Controllers.Toolbar.txtRadicalSqrt": "Racine carrée", + "SSE.Controllers.Toolbar.txtScriptCustom_1": "Script", + "SSE.Controllers.Toolbar.txtScriptCustom_2": "Script", + "SSE.Controllers.Toolbar.txtScriptCustom_3": "Script", + "SSE.Controllers.Toolbar.txtScriptCustom_4": "Script", + "SSE.Controllers.Toolbar.txtScriptSub": "Indice", + "SSE.Controllers.Toolbar.txtScriptSubSup": "Indice-Exposant", + "SSE.Controllers.Toolbar.txtScriptSubSupLeft": "Indice-Exposant gauche", + "SSE.Controllers.Toolbar.txtScriptSup": "Exposant", + "SSE.Controllers.Toolbar.txtSymbol_about": "Approximativement", + "SSE.Controllers.Toolbar.txtSymbol_additional": "Complément", + "SSE.Controllers.Toolbar.txtSymbol_aleph": "Aleph", + "SSE.Controllers.Toolbar.txtSymbol_alpha": "Alpha", + "SSE.Controllers.Toolbar.txtSymbol_approx": "Presque égale à", + "SSE.Controllers.Toolbar.txtSymbol_ast": "Opérateur astérisque", + "SSE.Controllers.Toolbar.txtSymbol_beta": "Bêta", + "SSE.Controllers.Toolbar.txtSymbol_beth": "Beth", + "SSE.Controllers.Toolbar.txtSymbol_bullet": "Opérateur puce", + "SSE.Controllers.Toolbar.txtSymbol_cap": "Intersection", + "SSE.Controllers.Toolbar.txtSymbol_cbrt": "Racine cubique", + "SSE.Controllers.Toolbar.txtSymbol_cdots": "Trois points médians", + "SSE.Controllers.Toolbar.txtSymbol_celsius": "Degrés Celsius", + "SSE.Controllers.Toolbar.txtSymbol_chi": "Сhi", + "SSE.Controllers.Toolbar.txtSymbol_cong": "Approximativement égal à", + "SSE.Controllers.Toolbar.txtSymbol_cup": "Union", + "SSE.Controllers.Toolbar.txtSymbol_ddots": "Trois points diagonaux vers le coin bas à droite", + "SSE.Controllers.Toolbar.txtSymbol_degree": "Degrés", + "SSE.Controllers.Toolbar.txtSymbol_delta": "Delta", + "SSE.Controllers.Toolbar.txtSymbol_div": "Signe de division", + "SSE.Controllers.Toolbar.txtSymbol_downarrow": "Flèche vers le bas", + "SSE.Controllers.Toolbar.txtSymbol_emptyset": "Ensemble vide", + "SSE.Controllers.Toolbar.txtSymbol_epsilon": "Epsilon", + "SSE.Controllers.Toolbar.txtSymbol_equals": "Égal", + "SSE.Controllers.Toolbar.txtSymbol_equiv": "Identique à", + "SSE.Controllers.Toolbar.txtSymbol_eta": "Êta", + "SSE.Controllers.Toolbar.txtSymbol_exists": "Existant", + "SSE.Controllers.Toolbar.txtSymbol_factorial": "Factorielle", + "SSE.Controllers.Toolbar.txtSymbol_fahrenheit": "Degrés Fahrenheit", + "SSE.Controllers.Toolbar.txtSymbol_forall": "Pour tous", + "SSE.Controllers.Toolbar.txtSymbol_gamma": "Gamma", + "SSE.Controllers.Toolbar.txtSymbol_geq": "Est supérieur ou égal à", + "SSE.Controllers.Toolbar.txtSymbol_gg": "Beaucoup plus grande que", + "SSE.Controllers.Toolbar.txtSymbol_greater": "Supérieur à", + "SSE.Controllers.Toolbar.txtSymbol_in": "Élément de", + "SSE.Controllers.Toolbar.txtSymbol_inc": "Incrément", + "SSE.Controllers.Toolbar.txtSymbol_infinity": "Infini", + "SSE.Controllers.Toolbar.txtSymbol_iota": "Iota", + "SSE.Controllers.Toolbar.txtSymbol_kappa": "Kappa", + "SSE.Controllers.Toolbar.txtSymbol_lambda": "Lambda", + "SSE.Controllers.Toolbar.txtSymbol_leftarrow": "Flèche gauche", + "SSE.Controllers.Toolbar.txtSymbol_leftrightarrow": "Double flèche horizontale", + "SSE.Controllers.Toolbar.txtSymbol_leq": "Est inférieur ou égal à", + "SSE.Controllers.Toolbar.txtSymbol_less": "Inférieur à", + "SSE.Controllers.Toolbar.txtSymbol_ll": "Beaucoup moins que", + "SSE.Controllers.Toolbar.txtSymbol_minus": "Moins", + "SSE.Controllers.Toolbar.txtSymbol_mp": "Moins plus", + "SSE.Controllers.Toolbar.txtSymbol_mu": "Mu", + "SSE.Controllers.Toolbar.txtSymbol_nabla": "Nabla", + "SSE.Controllers.Toolbar.txtSymbol_neq": "N'est pas égal à", + "SSE.Controllers.Toolbar.txtSymbol_ni": "Contient comme élément", + "SSE.Controllers.Toolbar.txtSymbol_not": "Signe négation", + "SSE.Controllers.Toolbar.txtSymbol_notexists": "Inexistant", + "SSE.Controllers.Toolbar.txtSymbol_nu": "Nu", + "SSE.Controllers.Toolbar.txtSymbol_o": "Omicron", + "SSE.Controllers.Toolbar.txtSymbol_omega": "Omega", + "SSE.Controllers.Toolbar.txtSymbol_partial": "Différentielle partielle", + "SSE.Controllers.Toolbar.txtSymbol_percent": "Pourcentage", + "SSE.Controllers.Toolbar.txtSymbol_phi": "Phi", + "SSE.Controllers.Toolbar.txtSymbol_pi": "Pi", + "SSE.Controllers.Toolbar.txtSymbol_plus": "Plus", + "SSE.Controllers.Toolbar.txtSymbol_pm": "Plus moins", + "SSE.Controllers.Toolbar.txtSymbol_propto": "Proportionnel à", + "SSE.Controllers.Toolbar.txtSymbol_psi": "Psi", + "SSE.Controllers.Toolbar.txtSymbol_qdrt": "Racine quatrième", + "SSE.Controllers.Toolbar.txtSymbol_qed": "Ce qu'il fallait démontrer", + "SSE.Controllers.Toolbar.txtSymbol_rddots": "Trois points diagonaux vers le coin haut à droite", + "SSE.Controllers.Toolbar.txtSymbol_rho": "Rho", + "SSE.Controllers.Toolbar.txtSymbol_rightarrow": "Flèche droite", + "SSE.Controllers.Toolbar.txtSymbol_sigma": "Sigma", + "SSE.Controllers.Toolbar.txtSymbol_sqrt": "Symbole de radical", + "SSE.Controllers.Toolbar.txtSymbol_tau": "Tau", + "SSE.Controllers.Toolbar.txtSymbol_therefore": "Par conséquent", + "SSE.Controllers.Toolbar.txtSymbol_theta": "Thêta", + "SSE.Controllers.Toolbar.txtSymbol_times": "Signe de multiplication", + "SSE.Controllers.Toolbar.txtSymbol_uparrow": "Flèche vers le haut", + "SSE.Controllers.Toolbar.txtSymbol_upsilon": "Upsilon", + "SSE.Controllers.Toolbar.txtSymbol_varepsilon": "Variante epsilon", + "SSE.Controllers.Toolbar.txtSymbol_varphi": "Variante phi", + "SSE.Controllers.Toolbar.txtSymbol_varpi": "Variante pi", + "SSE.Controllers.Toolbar.txtSymbol_varrho": "Variante rho", + "SSE.Controllers.Toolbar.txtSymbol_varsigma": "Variante sigma", + "SSE.Controllers.Toolbar.txtSymbol_vartheta": "Variante thêta", + "SSE.Controllers.Toolbar.txtSymbol_vdots": "Trois points verticaux", + "SSE.Controllers.Toolbar.txtSymbol_xsi": "Xi", + "SSE.Controllers.Toolbar.txtSymbol_zeta": "Zêta", "SSE.Controllers.Toolbar.warnMergeLostData": "Seulement les données de la cellule supérieure gauche seront conservées dans la cellule fusionnée.
Êtes-vous sûr de vouloir continuer ?", "SSE.Views.AutoFilterDialog.btnCustomFilter": "Filtre personnalisé", "SSE.Views.AutoFilterDialog.cancelButtonText": "Annuler", @@ -291,6 +707,7 @@ "SSE.Views.CellEditor.textManager": "Nom de gestionnaire", "SSE.Views.CellEditor.tipFormula": "Insérer une fonction", "SSE.Views.CellRangeDialog.errorMaxRows": "ERREUR ! Maximum de 255 séries de données par graphique.", + "SSE.Views.CellRangeDialog.errorStockChart": "L'ordre des lignes est incorrect. Pour créer un graphique boursier organisez vos données sur la feuille de calcul dans l'ordre suivant:
cours à l'ouverture, cours maximal, cours minimal, cours à la clôture.", "SSE.Views.CellRangeDialog.textCancel": "Annuler", "SSE.Views.CellRangeDialog.txtEmpty": "Ce champ est obligatoire", "SSE.Views.CellRangeDialog.txtInvalidRange": "ERREUR! Plage de cellules est non valide", @@ -306,9 +723,12 @@ "SSE.Views.ChartSettings.textLine": "Graphique en ligne", "SSE.Views.ChartSettings.textPie": "Graphiques à secteurs", "SSE.Views.ChartSettings.textPoint": "Diagramme de dispersion", + "SSE.Views.ChartSettings.textRanges": "Plage de données", + "SSE.Views.ChartSettings.textSelectData": "Sélectionner des données", "SSE.Views.ChartSettings.textSize": "Taille", "SSE.Views.ChartSettings.textStock": "Graphique d'état de stocks", "SSE.Views.ChartSettings.textStyle": "Style", + "SSE.Views.ChartSettings.textType": "Type", "SSE.Views.ChartSettings.textWidth": "Largeur", "SSE.Views.ChartSettingsDlg.cancelButtonText": "Annuler", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERREUR ! Maximum de 255 séries de données par graphique.", @@ -322,7 +742,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.textBottom": "En bas", "SSE.Views.ChartSettingsDlg.textCategoryName": "Nom de la catégorie", "SSE.Views.ChartSettingsDlg.textCenter": "Au centre", "SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Éléments de graphique,
légende de graphique", @@ -336,7 +756,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.textFit": "Ajuster à la largeur", "SSE.Views.ChartSettingsDlg.textFixed": "Corrigé", "SSE.Views.ChartSettingsDlg.textGridLines": "Quadrillage", "SSE.Views.ChartSettingsDlg.textHide": "Masquer", @@ -357,7 +777,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.textLeft": "Gauche", "SSE.Views.ChartSettingsDlg.textLeftOverlay": "Superposition à gauche", "SSE.Views.ChartSettingsDlg.textLegendBottom": "En bas", "SSE.Views.ChartSettingsDlg.textLegendLeft": "A gauche", @@ -386,9 +806,9 @@ "SSE.Views.ChartSettingsDlg.textOuterTop": "En haut à l'extérieur", "SSE.Views.ChartSettingsDlg.textOverlay": "Superposition", "SSE.Views.ChartSettingsDlg.textPie": "Graphiques à secteurs", - "SSE.Views.ChartSettingsDlg.textPoint": "Diagramme de dispersion", + "SSE.Views.ChartSettingsDlg.textPoint": "Nuages de points (XY)", "SSE.Views.ChartSettingsDlg.textReverse": "Valeurs en ordre inverse", - "SSE.Views.ChartSettingsDlg.textRight": "Right", + "SSE.Views.ChartSettingsDlg.textRight": "A droite", "SSE.Views.ChartSettingsDlg.textRightOverlay": "Superposition à droite", "SSE.Views.ChartSettingsDlg.textRotated": "Incliné", "SSE.Views.ChartSettingsDlg.textSelectData": "Sélectionner des données", @@ -408,7 +828,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.textTop": "En haut", "SSE.Views.ChartSettingsDlg.textTrillions": "Trillions", "SSE.Views.ChartSettingsDlg.textType": "Type", "SSE.Views.ChartSettingsDlg.textTypeData": "Type et données", @@ -467,6 +887,7 @@ "SSE.Views.DocumentHolder.textArrangeBackward": "Déplacer vers l'arrière", "SSE.Views.DocumentHolder.textArrangeForward": "Avancer", "SSE.Views.DocumentHolder.textArrangeFront": "Mettre au premier plan", + "SSE.Views.DocumentHolder.textEntriesList": "Choisir dans la liste déroulante", "SSE.Views.DocumentHolder.textFreezePanes": "Verrouiller les volets", "SSE.Views.DocumentHolder.textUnFreezePanes": "Dégager les volets", "SSE.Views.DocumentHolder.topCellText": "Aligner en haut", @@ -474,8 +895,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.txtAutoColumnWidth": "Ajustement automatique de largeur de colonne", + "SSE.Views.DocumentHolder.txtAutoRowHeight": "Ajustement automatique de hauteur de ligne", "SSE.Views.DocumentHolder.txtClear": "Effacer", "SSE.Views.DocumentHolder.txtClearAll": "Tout", "SSE.Views.DocumentHolder.txtClearComments": "Commentaires", @@ -483,10 +904,10 @@ "SSE.Views.DocumentHolder.txtClearHyper": "Liens hypertextes", "SSE.Views.DocumentHolder.txtClearText": "Texte", "SSE.Views.DocumentHolder.txtColumn": "Colonne entière", - "SSE.Views.DocumentHolder.txtColumnWidth": "Largeur de colonne", + "SSE.Views.DocumentHolder.txtColumnWidth": "Définir la 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.txtCustomColumnWidth": "Largeur de colonne personnalisée", + "SSE.Views.DocumentHolder.txtCustomRowHeight": "Hauteur de ligne personnalisée", "SSE.Views.DocumentHolder.txtCut": "Couper", "SSE.Views.DocumentHolder.txtDelete": "Supprimer", "SSE.Views.DocumentHolder.txtDescending": "Décroissant", @@ -503,7 +924,7 @@ "SSE.Views.DocumentHolder.txtPaste": "Coller", "SSE.Views.DocumentHolder.txtReapply": "Appliquer à nouveau", "SSE.Views.DocumentHolder.txtRow": "Ligne entière", - "SSE.Views.DocumentHolder.txtRowHeight": "Hauteur de ligne", + "SSE.Views.DocumentHolder.txtRowHeight": "Définir la hauteur de ligne", "SSE.Views.DocumentHolder.txtSelect": "Sélectionner", "SSE.Views.DocumentHolder.txtShiftDown": "Décaler les cellules vers le bas", "SSE.Views.DocumentHolder.txtShiftLeft": "Décaler les cellules vers la gauche", @@ -518,12 +939,14 @@ "SSE.Views.DocumentHolder.txtWidth": "Largeur", "SSE.Views.DocumentHolder.vertAlignText": "Alignement vertical", "SSE.Views.FileMenu.btnBackCaption": "Aller aux Documents", + "SSE.Views.FileMenu.btnCloseMenuCaption": "Fermer le menu", "SSE.Views.FileMenu.btnCreateNewCaption": "Créer un nouveau", "SSE.Views.FileMenu.btnDownloadCaption": "Télécharger comme...", "SSE.Views.FileMenu.btnHelpCaption": "Aide...", "SSE.Views.FileMenu.btnInfoCaption": "Information de feuille de calcul...", "SSE.Views.FileMenu.btnPrintCaption": "Imprimer", "SSE.Views.FileMenu.btnRecentFilesCaption": "Ouvrir récent...", + "SSE.Views.FileMenu.btnRenameCaption": "Renommer...", "SSE.Views.FileMenu.btnReturnCaption": "Retour à la feuille de calcul", "SSE.Views.FileMenu.btnRightsCaption": "Droits d'accès...", "SSE.Views.FileMenu.btnSaveAsCaption": "Enregistrer sous", @@ -637,8 +1060,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.textEdit": "Modifier", + "SSE.Views.ImageSettings.textEditObject": "Modifier l'objet", "SSE.Views.ImageSettings.textFromFile": "D'un fichier", "SSE.Views.ImageSettings.textFromUrl": "D'une URL", "SSE.Views.ImageSettings.textHeight": "Hauteur", @@ -681,7 +1104,7 @@ "SSE.Views.NamedRangeEditDlg.strWorkbook": "Classeur", "SSE.Views.NamedRangeEditDlg.textDataRange": "Plage de données", "SSE.Views.NamedRangeEditDlg.textExistName": "ERREUR! Gamme avec un tel nom existe déjà", - "SSE.Views.NamedRangeEditDlg.textInvalidName": "ERREUR! Nom de plage est non valide", + "SSE.Views.NamedRangeEditDlg.textInvalidName": "Le nom doit commencer par une lettre ou un soulignement et ne doit pas contenir de caractères non valides.", "SSE.Views.NamedRangeEditDlg.textInvalidRange": "ERREUR! Plage de cellules est non valable", "SSE.Views.NamedRangeEditDlg.textIsLocked": "ERREUR! Cet élément est en cours de modification par un autre utilisateur.", "SSE.Views.NamedRangeEditDlg.textName": "Nom", @@ -1053,6 +1476,7 @@ "SSE.Views.Toolbar.tipIncDecimal": "Ajouter une décimale", "SSE.Views.Toolbar.tipIncFont": "Augmenter taille de la police", "SSE.Views.Toolbar.tipInsertChart": "Insérer un graphique", + "SSE.Views.Toolbar.tipInsertEquation": "Insérer une équation", "SSE.Views.Toolbar.tipInsertHyperlink": "Ajouter un lien hypertexte", "SSE.Views.Toolbar.tipInsertImage": "Insérer une image", "SSE.Views.Toolbar.tipInsertOpt": "Insérer les cellules", From 8b13150ddc184289b2975bf6494f523169df1b4c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 28 Oct 2016 17:38:46 +0300 Subject: [PATCH 13/36] [SSE] Update layout for new translations. --- apps/spreadsheeteditor/main/app/template/ChartSettings.template | 2 +- .../main/app/template/ChartSettingsDlg.template | 2 +- apps/spreadsheeteditor/main/app/template/TableSettings.template | 2 +- apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/template/ChartSettings.template b/apps/spreadsheeteditor/main/app/template/ChartSettings.template index a9021ac86..f91491b05 100644 --- a/apps/spreadsheeteditor/main/app/template/ChartSettings.template +++ b/apps/spreadsheeteditor/main/app/template/ChartSettings.template @@ -42,7 +42,7 @@ - + diff --git a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template index 4f801f88e..41d60a7e7 100644 --- a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template +++ b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template @@ -26,7 +26,7 @@
- + diff --git a/apps/spreadsheeteditor/main/app/template/TableSettings.template b/apps/spreadsheeteditor/main/app/template/TableSettings.template index e48e86a7d..69a221e9d 100644 --- a/apps/spreadsheeteditor/main/app/template/TableSettings.template +++ b/apps/spreadsheeteditor/main/app/template/TableSettings.template @@ -64,7 +64,7 @@ - + diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js index 2a94dae67..3a8092487 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js @@ -86,7 +86,7 @@ define([ '
', '', '', - '', + '', '', '', '', From 0c251ec008559239d2245d0cdf87e0f9e8ac0416 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 28 Oct 2016 17:40:53 +0300 Subject: [PATCH 14/36] [DE] Delete unused field opts.data.urlDiff in SetHistoryData. --- apps/common/main/lib/controller/History.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js index 6618b7ad1..f01eb8f7e 100644 --- a/apps/common/main/lib/controller/History.js +++ b/apps/common/main/lib/controller/History.js @@ -163,7 +163,7 @@ define([ if (historyStore && data!==null) { var rev, revisions = historyStore.findRevisions(data.version), urlGetTime = new Date(); - var diff = opts.data.urlDiff || opts.data.changesUrl, + var diff = opts.data.changesUrl, url, docId; if (opts.data.current && opts.data.previous) { url = _.isEmpty(diff) ? opts.data.current.url : opts.data.previous.url; From 8b90eb49259d296a2d23187a0c0c9ae7caac0a04 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 31 Oct 2016 15:01:45 +0300 Subject: [PATCH 15/36] [DE] Changed format for data in setHistoryData (+ support for old format). { version: '...', url: '...', key: '...', changesUrl: '...', previous: { url: '...', key: '...', } } --- apps/common/main/lib/controller/History.js | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js index f01eb8f7e..18640494f 100644 --- a/apps/common/main/lib/controller/History.js +++ b/apps/common/main/lib/controller/History.js @@ -164,14 +164,9 @@ define([ var rev, revisions = historyStore.findRevisions(data.version), urlGetTime = new Date(); var diff = opts.data.changesUrl, - url, docId; - if (opts.data.current && opts.data.previous) { - url = _.isEmpty(diff) ? opts.data.current.url : opts.data.previous.url; - docId = _.isEmpty(diff) ? opts.data.current.key : opts.data.previous.key; - } else { - url = opts.data.url; - docId = _.isEmpty(diff) ? this.currentDocId : this.currentDocIdPrev; - } + url = (!_.isEmpty(diff) && opts.data.previous) ? opts.data.previous.url : opts.data.url, + docId = opts.data.key ? opts.data.key : this.currentDocId, + docIdPrev = opts.data.previous && opts.data.previous.key ? opts.data.previous.key : this.currentDocIdPrev; if (revisions && revisions.length>0) { for(var i=0; i Date: Tue, 1 Nov 2016 15:42:46 +0300 Subject: [PATCH 16/36] [SSE] Fix Bug 33304, fix Bug 33300. --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 10 +++++++--- apps/spreadsheeteditor/main/app/view/Toolbar.js | 7 ++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index de00631bc..afc3076ce 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -99,7 +99,8 @@ define([ tablestylename: undefined, tablename: undefined, namedrange_locked: false, - fontsize: undefined + fontsize: undefined, + multiselect: false }; var checkInsertAutoshape = function(e, action) { @@ -1172,7 +1173,7 @@ define([ Common.util.Shortcuts.delegateShortcuts({ shortcuts: { 'command+l,ctrl+l': function(e) { - if (me.editMode) { + if (me.editMode && !me._state.multiselect) { if (!me.api.asc_getCellInfo().asc_getFormatTableInfo()) me._setTableFormat(me.toolbar.mnuTableTemplatePicker.store.at(23).get('name')); } @@ -1197,7 +1198,7 @@ define([ e.stopPropagation(); }, 'command+k,ctrl+k': function (e) { - if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.api.isCellEdited) + if (me.editMode && !me.toolbar.mode.isEditMailMerge && !me.toolbar.mode.isEditDiagram && !me.api.isCellEdited && !me._state.multiselect) me.onHyperlink(); e.preventDefault(); } @@ -1808,6 +1809,9 @@ define([ need_disable = this._state.controlsdisabled.filters || !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true); toolbar.lockToolbar(SSE.enumLock.ruleDelFilter, need_disable, {array:[toolbar.btnClearAutofilter,toolbar.mnuitemClearFilter]}); + + this._state.multiselect = info.asc_getFlags().asc_getMultiselect(); + toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink]}); } fontparam = toolbar.numFormatTypes[info.asc_getNumFormatType()]; diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 0279c464b..d1960fd3e 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -75,7 +75,8 @@ define([ ruleFilter: 'rule-filter', ruleDelFilter: 'rule-clear-filter', menuFileOpen: 'menu-file-open', - cantPrint: 'cant-print' + cantPrint: 'cant-print', + multiselect: 'is-multiselect' }; SSE.Views.Toolbar = Backbone.View.extend(_.extend({ @@ -495,7 +496,7 @@ define([ id : 'id-toolbar-btn-inserthyperlink', cls : 'btn-toolbar', iconCls : 'btn-inserthyperlink', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.lostConnect, _set.coAuth] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.multiselect, _set.lostConnect, _set.coAuth] }); me.btnInsertChart = new Common.UI.Button({ @@ -596,7 +597,7 @@ define([ id : 'id-toolbar-btn-ttempl', cls : 'btn-toolbar', iconCls : 'btn-ttempl', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter], + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.multiselect], menu : new Common.UI.Menu({ items: [ { template: _.template('
') } From 02897bda94d75d7cd213a4f8336f88614d35de92 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 1 Nov 2016 18:04:35 +0300 Subject: [PATCH 17/36] [SSE] Bug 33304: disable hyperlink actions in context menu when several cells are selected (multiselect is true). --- .../main/app/controller/DocumentHolder.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index e964e4b13..1c0671027 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1264,7 +1264,8 @@ define([ var iscelledit = this.api.isCellEdited, formatTableInfo = cellinfo.asc_getFormatTableInfo(), - isintable = (formatTableInfo !== null); + isintable = (formatTableInfo !== null), + ismultiselect = cellinfo.asc_getFlags().asc_getMultiselect(); documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null; documentHolder.ssMenu.cellColor = cellinfo.asc_getFill().asc_getColor(); documentHolder.ssMenu.fontColor = cellinfo.asc_getFont().asc_getColor(); @@ -1297,8 +1298,8 @@ define([ } var hyperinfo = cellinfo.asc_getHyperlink(); - documentHolder.menuHyperlink.setVisible(iscellmenu && hyperinfo && !iscelledit); - documentHolder.menuAddHyperlink.setVisible(iscellmenu && !hyperinfo && !iscelledit); + documentHolder.menuHyperlink.setVisible(iscellmenu && hyperinfo && !iscelledit && !ismultiselect); + documentHolder.menuAddHyperlink.setVisible(iscellmenu && !hyperinfo && !iscelledit && !ismultiselect); documentHolder.pmiRowHeight.setVisible(isrowmenu||isallmenu); documentHolder.pmiColumnWidth.setVisible(iscolmenu||isallmenu); From 541000f308a6ec1fc51194b15536302bdb20e969 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 2 Nov 2016 13:24:16 +0300 Subject: [PATCH 18/36] Change DocEditor version. --- apps/api/documents/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index f62c1bdf9..9eea8b451 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -551,7 +551,7 @@ }; DocsAPI.DocEditor.version = function() { - return '3.0b##BN#'; + return '4.2.0'; }; MessageDispatcher = function(fn, scope) { From 24ad7e79d767e7661759341ef10cb0282fc1b380 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 2 Nov 2016 15:29:48 +0300 Subject: [PATCH 19/36] [DE] Bug with versions history when serverVersion for revision != app.buildVersion. --- apps/common/main/lib/controller/History.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js index 18640494f..3f5f40877 100644 --- a/apps/common/main/lib/controller/History.js +++ b/apps/common/main/lib/controller/History.js @@ -163,7 +163,7 @@ define([ if (historyStore && data!==null) { var rev, revisions = historyStore.findRevisions(data.version), urlGetTime = new Date(); - var diff = opts.data.changesUrl, + var diff = (this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes url = (!_.isEmpty(diff) && opts.data.previous) ? opts.data.previous.url : opts.data.url, docId = opts.data.key ? opts.data.key : this.currentDocId, docIdPrev = opts.data.previous && opts.data.previous.key ? opts.data.previous.key : this.currentDocIdPrev; From 6804c4a2de4eb802ffa20e006f312a62d7ad91d6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 2 Nov 2016 16:40:35 +0300 Subject: [PATCH 20/36] [DE] Disable language button in the status bar until languages are loaded. --- apps/documenteditor/main/app/view/Statusbar.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js index fccebc4f9..56875273d 100644 --- a/apps/documenteditor/main/app/view/Statusbar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -150,7 +150,8 @@ define([ this.btnDocLanguage = new Common.UI.Button({ el: $('#btn-doc-lang',this.el), hint: this.tipSetDocLang, - hintAnchor: 'top' + hintAnchor: 'top', + disabled: true }); this.btnSetSpelling = new Common.UI.Button({ @@ -203,7 +204,8 @@ define([ this.btnLanguage = new Common.UI.Button({ el: panelLang, hint: this.tipSetLang, - hintAnchor: 'top-left' + hintAnchor: 'top-left', + disabled: true }); this.btnLanguage.cmpEl.on({ 'show.bs.dropdown': function () { @@ -465,6 +467,10 @@ define([ }, this); this.langMenu.doLayout(); + if (this.langMenu.items.length>0) { + this.btnLanguage.setDisabled(false); + this.btnDocLanguage.setDisabled(false); + } }, setLanguage: function(info) { @@ -493,8 +499,9 @@ define([ }, SetDisabled: function(disable) { - this.btnLanguage.setDisabled(disable); - this.btnDocLanguage.setDisabled(disable); + var langs = this.langMenu.items.length>0; + this.btnLanguage.setDisabled(disable || !langs); + this.btnDocLanguage.setDisabled(disable || !langs); if (disable) { this.state.changespanel = this.mnuChangesPanel.checked; } From d13f0ac0b083fac2ccff4587cff32f2c79e5f6e6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 3 Nov 2016 15:00:48 +0300 Subject: [PATCH 21/36] [SSE] Don't show tab context menu when server is disconnected. --- apps/spreadsheeteditor/main/app/view/Statusbar.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index d4060a3de..044e28033 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -501,7 +501,8 @@ define([ onTabMenu: function (o, index, tab) { if (this.mode.isEdit && !this.isEditFormula && (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.Chart) && - (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.FormatTable)) { + (this.rangeSelectionMode !== Asc.c_oAscSelectionDialogType.FormatTable) && + !this.mode.isDisconnected ) { if (tab && tab.sheetindex >= 0) { var rect = tab.$el.get(0).getBoundingClientRect(), childPos = tab.$el.offset(), From d2df65b0b66a4a461d939feba4c06413f4d76a58 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 3 Nov 2016 15:03:37 +0300 Subject: [PATCH 22/36] [SSE] Fix Bug 33322. --- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index afc3076ce..34d9c5b52 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1183,7 +1183,7 @@ define([ 'command+shift+l,ctrl+shift+l': function(e) { var state = me._state.filter; me._state.filter = undefined; - if (me.editMode && me.api) { + if (me.editMode && me.api && !me._state.multiselect) { if (me._state.tablename || state) me.api.asc_changeAutoFilter(me._state.tablename, Asc.c_oAscChangeFilterOptions.filter, !state); else From 860a8114ec4342d032bc441944dc220849be7bca Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 7 Nov 2016 11:45:15 +0300 Subject: [PATCH 23/36] Fix Bug 33354. --- apps/common/main/lib/component/Window.js | 5 +++++ apps/common/main/lib/view/Comments.js | 14 ++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index 8af21c295..3c5063aa7 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -641,6 +641,11 @@ define([ $(document).on('keydown.' + this.cid, this.binding.keydown); var me = this; + + setTimeout(function () { + me.fireEvent('animate:before', me); + }, 10); + if (this.options.animate !== false) { this.$window.css({ '-webkit-transform': 'scale(0.8)', diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js index 8deac95d0..531df2e59 100644 --- a/apps/common/main/lib/view/Comments.js +++ b/apps/common/main/lib/view/Comments.js @@ -473,19 +473,17 @@ define([ }); me.on({ 'show': function () { - - // me.calculateSizeOfContent(); me.commentsView.autoHeightTextBox(); - - var text = me.$window.find('textarea'); - if (text && text.length) - text.focus(); - - text.keydown(function (event) { + me.$window.find('textarea').keydown(function (event) { if (event.keyCode == Common.UI.Keys.ESC) { me.hide(); } }); + }, + 'animate:before': function () { + var text = me.$window.find('textarea'); + if (text && text.length) + text.focus(); } }); } From c17a0051172b9ddab66cd9487df61deccf789a12 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 7 Nov 2016 11:45:55 +0300 Subject: [PATCH 24/36] Fix Bug 29708. --- apps/common/main/lib/view/SearchDialog.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/view/SearchDialog.js b/apps/common/main/lib/view/SearchDialog.js index 9a6d3c3d1..4eedef793 100644 --- a/apps/common/main/lib/view/SearchDialog.js +++ b/apps/common/main/lib/view/SearchDialog.js @@ -171,6 +171,8 @@ this.txtSearch.on('keydown', null, 'search', _.bind(this.onKeyPress, this)); this.txtReplace.on('keydown', null, 'replace', _.bind(this.onKeyPress, this)); + this.on('animate:before', _.bind(this.focus, this)); + return this; }, @@ -189,10 +191,10 @@ focus: function() { var me = this; - _.delay(function(){ + setTimeout(function(){ me.txtSearch.focus(); me.txtSearch.select(); - }, 300); + }, 10); }, onKeyPress: function(event) { From 08e61d9cd862ae211fcb727533fccf5a9213226d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 7 Nov 2016 14:43:41 +0300 Subject: [PATCH 25/36] Fix Bug 24462. --- apps/common/main/lib/component/MenuItem.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/common/main/lib/component/MenuItem.js b/apps/common/main/lib/component/MenuItem.js index a0afe4d35..5e0fe94d2 100644 --- a/apps/common/main/lib/component/MenuItem.js +++ b/apps/common/main/lib/component/MenuItem.js @@ -336,6 +336,14 @@ define([ if (!me.menu.isOver) me.cmpEl.removeClass('over'); }, 200); + + if (e.type !== 'focusout') { // when mouseleave from clicked menu item with submenu + var focused = me.cmpEl.children(':focus'); + if (focused.length>0) { + focused.blur(); + me.cmpEl.closest('ul').focus(); + } + } } } }); From c1fcad76d02f2bc0ff98e79fe649d1ac18a34f1b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 7 Nov 2016 16:00:11 +0300 Subject: [PATCH 26/36] [SSE] Bug 26981. --- .../main/app/controller/Toolbar.js | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 34d9c5b52..c403c8a9b 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1557,13 +1557,10 @@ define([ onApiSelectionChanged: function(info) { if (!this.editMode) return; - var selectionType = info.asc_getFlags().asc_getSelectionType(); - var coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true) : false; - if (this._disableEditOptions(selectionType, coauth_disable)) { - return; - } - - var me = this, + var selectionType = info.asc_getFlags().asc_getSelectionType(), + coauth_disable = (!this.toolbar.mode.isEditMailMerge && !this.toolbar.mode.isEditDiagram) ? (info.asc_getLocked()===true) : false, + editOptionsDisabled = this._disableEditOptions(selectionType, coauth_disable), + me = this, toolbar = this.toolbar, fontobj = info.asc_getFont(), val, need_disable = false; @@ -1574,6 +1571,15 @@ define([ Common.NotificationCenter.trigger('fonts:change', fontobj); } + /* read font size */ + var str_size = fontobj.asc_getSize(); + if (this._state.fontsize !== str_size) { + toolbar.cmbFontSize.setValue((str_size!==undefined) ? str_size : ''); + this._state.fontsize = str_size; + } + + if (editOptionsDisabled) return; + /* read font params */ if (!toolbar.mode.isEditMailMerge && !toolbar.mode.isEditDiagram) { val = fontobj.asc_getBold(); @@ -1593,13 +1599,6 @@ define([ } } - /* read font size */ - var str_size = fontobj.asc_getSize(); - if (this._state.fontsize !== str_size) { - toolbar.cmbFontSize.setValue((str_size!==undefined) ? str_size : ''); - this._state.fontsize = str_size; - } - /* read font color */ var clr, color, From bb67b12eb2fb0096350f042b731c796c1ec04f40 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 7 Nov 2016 17:52:07 +0300 Subject: [PATCH 27/36] Fix Bug 32650. --- apps/common/main/lib/component/ComboBoxFonts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index fca307a43..4b1fdc3eb 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -453,7 +453,7 @@ define([ if (!me.tiles) me.tiles = []; if (storeCount !== me.tiles.length) { for (j = me.tiles.length; j < storeCount; ++j) { - me.tiles.push(null); + me.tiles.unshift(null); } } From 5f82b1e5cd9277cac62444925e8d8b4b30a71fb4 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 8 Nov 2016 11:53:01 +0300 Subject: [PATCH 28/36] Update translations. --- apps/documenteditor/main/locale/cs.json | 2 +- apps/documenteditor/main/locale/de.json | 2 +- apps/documenteditor/main/locale/es.json | 2 +- apps/documenteditor/main/locale/fr.json | 10 ++++----- apps/documenteditor/main/locale/pt.json | 2 +- apps/documenteditor/main/locale/sl.json | 2 +- apps/presentationeditor/main/locale/cs.json | 2 +- apps/presentationeditor/main/locale/de.json | 2 +- apps/presentationeditor/main/locale/en.json | 8 +++---- apps/presentationeditor/main/locale/es.json | 2 +- apps/presentationeditor/main/locale/fr.json | 18 ++++++++-------- apps/presentationeditor/main/locale/pt.json | 2 +- apps/presentationeditor/main/locale/sl.json | 2 +- apps/spreadsheeteditor/main/locale/cs.json | 2 +- apps/spreadsheeteditor/main/locale/de.json | 2 +- apps/spreadsheeteditor/main/locale/en.json | 24 ++++++++++----------- apps/spreadsheeteditor/main/locale/es.json | 2 +- apps/spreadsheeteditor/main/locale/fr.json | 18 ++++++++-------- apps/spreadsheeteditor/main/locale/lv.json | 2 +- apps/spreadsheeteditor/main/locale/pt.json | 2 +- apps/spreadsheeteditor/main/locale/sl.json | 2 +- 21 files changed, 55 insertions(+), 55 deletions(-) diff --git a/apps/documenteditor/main/locale/cs.json b/apps/documenteditor/main/locale/cs.json index b907b3963..4ffea5c06 100644 --- a/apps/documenteditor/main/locale/cs.json +++ b/apps/documenteditor/main/locale/cs.json @@ -107,7 +107,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Poslat", "Common.Views.Comments.textAdd": "Přidat", - "Common.Views.Comments.textAddComment": "Přidat komentář", + "Common.Views.Comments.textAddComment": "Přidat", "Common.Views.Comments.textAddCommentToDoc": "Přidat komentář k dokumentu", "Common.Views.Comments.textAddReply": "Přidat odpověď", "Common.Views.Comments.textAnonym": "Návštěvník", diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index 61e3cf093..8a76a0a09 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -112,7 +112,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Senden", "Common.Views.Comments.textAdd": "Hinzufügen", - "Common.Views.Comments.textAddComment": "Kommentar hinzufügen", + "Common.Views.Comments.textAddComment": "Hinzufügen", "Common.Views.Comments.textAddCommentToDoc": "Kommentar zum Dokument hinzufügen", "Common.Views.Comments.textAddReply": "Antwort hinzufügen", "Common.Views.Comments.textAnonym": "Gast", diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index fc1790b27..47dd15f4b 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -112,7 +112,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "Aceptar", "Common.Views.Chat.textSend": "Enviar", "Common.Views.Comments.textAdd": "Añadir", - "Common.Views.Comments.textAddComment": "Añadir comentario", + "Common.Views.Comments.textAddComment": "Añadir", "Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento", "Common.Views.Comments.textAddReply": "Añadir respuesta", "Common.Views.Comments.textAnonym": "Visitante", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 70b0a8832..68720e1f8 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -69,9 +69,9 @@ "Common.UI.ComboDataView.emptyComboText": "Aucun style", "Common.UI.ExtendedColorDialog.addButtonText": "Ajouter", "Common.UI.ExtendedColorDialog.cancelButtonText": "Annuler", - "Common.UI.ExtendedColorDialog.textCurrent": "Actuel", + "Common.UI.ExtendedColorDialog.textCurrent": "Actuelle", "Common.UI.ExtendedColorDialog.textHexErr": "La valeur saisie est incorrecte.
Entrez une valeur de 000000 à FFFFFF.", - "Common.UI.ExtendedColorDialog.textNew": "Nouveau", + "Common.UI.ExtendedColorDialog.textNew": "Nouvelle", "Common.UI.ExtendedColorDialog.textRGBErr": "La valeur saisie est incorrecte.
Entrez une valeur numérique de 0 à 255.", "Common.UI.HSBColorPicker.textNoColor": "Pas de couleur", "Common.UI.SearchDialog.textHighlight": "Surligner les résultats", @@ -112,8 +112,8 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Envoyer", "Common.Views.Comments.textAdd": "Ajouter", - "Common.Views.Comments.textAddComment": "Ajouter un commentaire", - "Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au Document", + "Common.Views.Comments.textAddComment": "Ajouter", + "Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au document", "Common.Views.Comments.textAddReply": "Ajouter une réponse", "Common.Views.Comments.textAnonym": "Invité", "Common.Views.Comments.textCancel": "Annuler", @@ -1397,7 +1397,7 @@ "DE.Views.TableSettingsAdvanced.txtPt": "Point", "DE.Views.TextArtSettings.strColor": "Couleur", "DE.Views.TextArtSettings.strFill": "Remplissage", - "DE.Views.TextArtSettings.strSize": "Size", + "DE.Views.TextArtSettings.strSize": "Taille", "DE.Views.TextArtSettings.strStroke": "Trait", "DE.Views.TextArtSettings.strTransparency": "Opacité", "DE.Views.TextArtSettings.strType": "Type", diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json index c5a5647f8..439f4a33b 100644 --- a/apps/documenteditor/main/locale/pt.json +++ b/apps/documenteditor/main/locale/pt.json @@ -107,7 +107,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Enviar", "Common.Views.Comments.textAdd": "Adicionar", - "Common.Views.Comments.textAddComment": "Adicionar comentário", + "Common.Views.Comments.textAddComment": "Adicionar", "Common.Views.Comments.textAddCommentToDoc": "Adicionar comentário ao documento", "Common.Views.Comments.textAddReply": "Adicionar resposta", "Common.Views.Comments.textAnonym": "Visitante", diff --git a/apps/documenteditor/main/locale/sl.json b/apps/documenteditor/main/locale/sl.json index 42f84307f..f236291c0 100644 --- a/apps/documenteditor/main/locale/sl.json +++ b/apps/documenteditor/main/locale/sl.json @@ -107,7 +107,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Pošlji", "Common.Views.Comments.textAdd": "Dodaj", - "Common.Views.Comments.textAddComment": "Dodaj komentar", + "Common.Views.Comments.textAddComment": "Dodaj", "Common.Views.Comments.textAddCommentToDoc": "K dokumentu dodaj komentar", "Common.Views.Comments.textAddReply": "Dodaj odgovor", "Common.Views.Comments.textAnonym": "Gost", diff --git a/apps/presentationeditor/main/locale/cs.json b/apps/presentationeditor/main/locale/cs.json index 21c501bbb..9be26601f 100644 --- a/apps/presentationeditor/main/locale/cs.json +++ b/apps/presentationeditor/main/locale/cs.json @@ -49,7 +49,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Poslat", "Common.Views.Comments.textAdd": "Přidat", - "Common.Views.Comments.textAddComment": "Přidat komentář", + "Common.Views.Comments.textAddComment": "Přidat", "Common.Views.Comments.textAddCommentToDoc": "Přidat komentář k dokumentu", "Common.Views.Comments.textAddReply": "Přidat odpověď", "Common.Views.Comments.textAnonym": "Návštěvník", diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index d79c408d5..eef599830 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -54,7 +54,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Senden", "Common.Views.Comments.textAdd": "Hinzufügen", - "Common.Views.Comments.textAddComment": "Kommentar hinzufügen", + "Common.Views.Comments.textAddComment": "Hinzufügen", "Common.Views.Comments.textAddCommentToDoc": "Kommentar zum Dokument hinzufügen", "Common.Views.Comments.textAddReply": "Antwort hinzufügen", "Common.Views.Comments.textAnonym": "Gast", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index ff29465f0..8aa256e6e 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -592,11 +592,13 @@ "PE.Views.DocumentHolder.advancedParagraphText": "Text Advanced Settings", "PE.Views.DocumentHolder.advancedShapeText": "Shape Advanced Settings", "PE.Views.DocumentHolder.advancedTableText": "Table Advanced Settings", + "PE.Views.DocumentHolder.alignmentText": "Alignment", "PE.Views.DocumentHolder.belowText": "Below", "PE.Views.DocumentHolder.bottomCellText": "Align Bottom", "PE.Views.DocumentHolder.cellAlignText": "Cell Vertical Alignment", "PE.Views.DocumentHolder.cellText": "Cell", "PE.Views.DocumentHolder.centerCellText": "Align Center", + "PE.Views.DocumentHolder.centerText": "Center", "PE.Views.DocumentHolder.columnText": "Column", "PE.Views.DocumentHolder.deleteColumnText": "Delete Column", "PE.Views.DocumentHolder.deleteRowText": "Delete Row", @@ -616,9 +618,11 @@ "PE.Views.DocumentHolder.insertRowBelowText": "Row Below", "PE.Views.DocumentHolder.insertRowText": "Insert Row", "PE.Views.DocumentHolder.insertText": "Insert", + "PE.Views.DocumentHolder.leftText": "Left", "PE.Views.DocumentHolder.mergeCellsText": "Merge Cells", "PE.Views.DocumentHolder.originalSizeText": "Default Size", "PE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink", + "PE.Views.DocumentHolder.rightText": "Right", "PE.Views.DocumentHolder.rowText": "Row", "PE.Views.DocumentHolder.selectText": "Select", "PE.Views.DocumentHolder.splitCellsText": "Split Cell...", @@ -728,10 +732,6 @@ "PE.Views.DocumentHolder.txtUnderbar": "Bar under text", "PE.Views.DocumentHolder.txtUngroup": "Ungroup", "PE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", - "PE.Views.DocumentHolder.alignmentText": "Alignment", - "PE.Views.DocumentHolder.leftText": "Left", - "PE.Views.DocumentHolder.rightText": "Right", - "PE.Views.DocumentHolder.centerText": "Center", "PE.Views.DocumentPreview.goToSlideText": "Go to Slide", "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}", "PE.Views.DocumentPreview.txtClose": "Close Slideshow", diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index 21a2fe207..ff4f541b6 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -54,7 +54,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "Aceptar", "Common.Views.Chat.textSend": "Enviar", "Common.Views.Comments.textAdd": "Añadir", - "Common.Views.Comments.textAddComment": "Añadir comentario", + "Common.Views.Comments.textAddComment": "Añadir", "Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento", "Common.Views.Comments.textAddReply": "Añadir respuesta", "Common.Views.Comments.textAnonym": "Visitante", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index beac0ee03..e4eb4e4c7 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -23,7 +23,7 @@ "Common.UI.SearchDialog.textTitle": "Recherche", "Common.UI.SearchDialog.textTitle2": "Recherche", "Common.UI.SearchDialog.textWholeWords": "Seulement les mots entiers", - "Common.UI.SearchDialog.txtBtnHideReplace": "Cacher Remplacer", + "Common.UI.SearchDialog.txtBtnHideReplace": "Masquer le champ de remplacement", "Common.UI.SearchDialog.txtBtnReplace": "Remplacer", "Common.UI.SearchDialog.txtBtnReplaceAll": "Remplacer tout", "Common.UI.SynchronizeTip.textDontShow": "N'afficher plus ce message", @@ -54,8 +54,8 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Envoyer", "Common.Views.Comments.textAdd": "Ajouter", - "Common.Views.Comments.textAddComment": "Ajouter un commentaire", - "Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au Document", + "Common.Views.Comments.textAddComment": "Ajouter", + "Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au document", "Common.Views.Comments.textAddReply": "Ajouter une réponse", "Common.Views.Comments.textAnonym": "Invité", "Common.Views.Comments.textCancel": "Annuler", @@ -587,7 +587,7 @@ "PE.Views.ChartSettings.textStyle": "Style", "PE.Views.ChartSettings.textWidth": "Largeur", "PE.Views.DocumentHolder.aboveText": "Au-dessus", - "PE.Views.DocumentHolder.addCommentText": "Ajouter un commentaire", + "PE.Views.DocumentHolder.addCommentText": "Ajouter commentaire", "PE.Views.DocumentHolder.advancedImageText": "Paramètres avancés de l'image", "PE.Views.DocumentHolder.advancedParagraphText": "Paramètres avancés du texte", "PE.Views.DocumentHolder.advancedShapeText": "Paramètres avancés de la forme", @@ -607,7 +607,7 @@ "PE.Views.DocumentHolder.direct270Text": "Rotate at 270°", "PE.Views.DocumentHolder.direct90Text": "Rotate at 90°", "PE.Views.DocumentHolder.directHText": "Horizontal", - "PE.Views.DocumentHolder.directionText": "Text Direction", + "PE.Views.DocumentHolder.directionText": "Orientation du texte", "PE.Views.DocumentHolder.editChartText": "Modifier les données", "PE.Views.DocumentHolder.editHyperlinkText": "Modifier le lien hypertexte", "PE.Views.DocumentHolder.hyperlinkText": "Lien hypertexte", @@ -894,7 +894,7 @@ "PE.Views.RightMenu.txtShapeSettings": "Paramètres de la forme", "PE.Views.RightMenu.txtSlideSettings": "Paramètres de la diapositive", "PE.Views.RightMenu.txtTableSettings": "Paramètres du tableau", - "PE.Views.RightMenu.txtTextArtSettings": "Text Art Settings", + "PE.Views.RightMenu.txtTextArtSettings": "Paramètres de texte d'art", "PE.Views.ShapeSettings.strBackground": "Couleur d'arrière-plan", "PE.Views.ShapeSettings.strChange": "Modifier la forme automatique", "PE.Views.ShapeSettings.strColor": "Couleur", @@ -1049,7 +1049,7 @@ "PE.Views.SlideSizeSettings.textSlideSize": "Taille de la diapositive", "PE.Views.SlideSizeSettings.textTitle": "Paramètres de taille", "PE.Views.SlideSizeSettings.textWidth": "Largeur", - "PE.Views.SlideSizeSettings.txt35": "35 mm Slides", + "PE.Views.SlideSizeSettings.txt35": "Diapositives 35 mm", "PE.Views.SlideSizeSettings.txtA3": "A3 Paper (297x420 mm)", "PE.Views.SlideSizeSettings.txtA4": "A4 Paper (210x297 mm)", "PE.Views.SlideSizeSettings.txtB4": "B4 (ICO) Paper (250x353 mm)", @@ -1135,7 +1135,7 @@ "PE.Views.TextArtSettings.strForeground": "Couleur de premier plan", "PE.Views.TextArtSettings.strPattern": "Modèle", "PE.Views.TextArtSettings.strSize": "Size", - "PE.Views.TextArtSettings.strStroke": "Stroke", + "PE.Views.TextArtSettings.strStroke": "Trait", "PE.Views.TextArtSettings.strTransparency": "Opacité", "PE.Views.TextArtSettings.strType": "Type", "PE.Views.TextArtSettings.textBorderSizeErr": "The entered value is incorrect.
Please enter a value between 0 pt and 1584 pt.", @@ -1158,7 +1158,7 @@ "PE.Views.TextArtSettings.textTemplate": "Template", "PE.Views.TextArtSettings.textTexture": "From Texture", "PE.Views.TextArtSettings.textTile": "Tile", - "PE.Views.TextArtSettings.textTransform": "Transform", + "PE.Views.TextArtSettings.textTransform": "Transformer", "PE.Views.TextArtSettings.txtBrownPaper": "Papier brun", "PE.Views.TextArtSettings.txtCanvas": "Toile", "PE.Views.TextArtSettings.txtCarton": "Carton", diff --git a/apps/presentationeditor/main/locale/pt.json b/apps/presentationeditor/main/locale/pt.json index aff12ba36..3d301844e 100644 --- a/apps/presentationeditor/main/locale/pt.json +++ b/apps/presentationeditor/main/locale/pt.json @@ -49,7 +49,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Enviar", "Common.Views.Comments.textAdd": "Adicionar", - "Common.Views.Comments.textAddComment": "Adicionar comentário", + "Common.Views.Comments.textAddComment": "Adicionar", "Common.Views.Comments.textAddCommentToDoc": "Adicionar comentário ao documento", "Common.Views.Comments.textAddReply": "Adicionar resposta", "Common.Views.Comments.textAnonym": "Visitante", diff --git a/apps/presentationeditor/main/locale/sl.json b/apps/presentationeditor/main/locale/sl.json index 4fcfd92d2..64859d600 100644 --- a/apps/presentationeditor/main/locale/sl.json +++ b/apps/presentationeditor/main/locale/sl.json @@ -49,7 +49,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Pošlji", "Common.Views.Comments.textAdd": "Dodaj", - "Common.Views.Comments.textAddComment": "Dodaj komentar", + "Common.Views.Comments.textAddComment": "Dodaj", "Common.Views.Comments.textAddCommentToDoc": "K dokumentu dodaj komentar", "Common.Views.Comments.textAddReply": "Dodaj odgovor", "Common.Views.Comments.textAnonym": "Gost", diff --git a/apps/spreadsheeteditor/main/locale/cs.json b/apps/spreadsheeteditor/main/locale/cs.json index e552fd3f4..50c66e23b 100644 --- a/apps/spreadsheeteditor/main/locale/cs.json +++ b/apps/spreadsheeteditor/main/locale/cs.json @@ -46,7 +46,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Poslat", "Common.Views.Comments.textAdd": "Přidat", - "Common.Views.Comments.textAddComment": "Přidat komentář", + "Common.Views.Comments.textAddComment": "Přidat", "Common.Views.Comments.textAddCommentToDoc": "Přidat komentář k dokumentu", "Common.Views.Comments.textAddReply": "Přidat odpověď", "Common.Views.Comments.textAnonym": "Návštěvník", diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index 7613eac9c..ed4dc29ca 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -51,7 +51,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Senden", "Common.Views.Comments.textAdd": "Hinzufügen", - "Common.Views.Comments.textAddComment": "Kommentar hinzufügen", + "Common.Views.Comments.textAddComment": "Hinzufügen", "Common.Views.Comments.textAddCommentToDoc": "Kommentar zum Dokument hinzufügen", "Common.Views.Comments.textAddReply": "Antwort hinzufügen", "Common.Views.Comments.textAnonym": "Gast", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 1dd24b78b..cd03e3aa8 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -98,9 +98,21 @@ "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "File name", "Common.Views.RenameDialog.txtInvalidName": "The file name cannot contain any of the following characters: ", + "SSE.Controllers.DocumentHolder.alignmentText": "Alignment", + "SSE.Controllers.DocumentHolder.centerText": "Center", + "SSE.Controllers.DocumentHolder.deleteColumnText": "Delete Column", + "SSE.Controllers.DocumentHolder.deleteRowText": "Delete Row", + "SSE.Controllers.DocumentHolder.deleteText": "Delete", "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.insertColumnLeftText": "Column Left", + "SSE.Controllers.DocumentHolder.insertColumnRightText": "Column Right", + "SSE.Controllers.DocumentHolder.insertRowAboveText": "Row Above", + "SSE.Controllers.DocumentHolder.insertRowBelowText": "Row Below", + "SSE.Controllers.DocumentHolder.insertText": "Insert", + "SSE.Controllers.DocumentHolder.leftText": "Left", "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning", + "SSE.Controllers.DocumentHolder.rightText": "Right", "SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Column Width {0} symbols ({1} pixels)", "SSE.Controllers.DocumentHolder.textChangeRowHeight": "Row Height {0} points ({1} pixels)", "SSE.Controllers.DocumentHolder.textCtrlClick": "Press CTRL and click link", @@ -181,18 +193,6 @@ "SSE.Controllers.DocumentHolder.txtTop": "Top", "SSE.Controllers.DocumentHolder.txtUnderbar": "Bar under text", "SSE.Controllers.DocumentHolder.txtWidth": "Width", - "SSE.Controllers.DocumentHolder.insertText": "Insert", - "SSE.Controllers.DocumentHolder.alignmentText": "Alignment", - "SSE.Controllers.DocumentHolder.leftText": "Left", - "SSE.Controllers.DocumentHolder.rightText": "Right", - "SSE.Controllers.DocumentHolder.centerText": "Center", - "SSE.Controllers.DocumentHolder.insertRowAboveText": "Row Above", - "SSE.Controllers.DocumentHolder.insertRowBelowText": "Row Below", - "SSE.Controllers.DocumentHolder.insertColumnLeftText": "Column Left", - "SSE.Controllers.DocumentHolder.insertColumnRightText": "Column Right", - "SSE.Controllers.DocumentHolder.deleteText": "Delete", - "SSE.Controllers.DocumentHolder.deleteRowText": "Delete Row", - "SSE.Controllers.DocumentHolder.deleteColumnText": "Delete Column", "SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet", "SSE.Controllers.LeftMenu.textByColumns": "By columns", "SSE.Controllers.LeftMenu.textByRows": "By rows", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index edc45f3ef..f3602ea44 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -51,7 +51,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Enviar", "Common.Views.Comments.textAdd": "Añadir", - "Common.Views.Comments.textAddComment": "Añadir comentario", + "Common.Views.Comments.textAddComment": "Añadir", "Common.Views.Comments.textAddCommentToDoc": "Añadir comentario a documento", "Common.Views.Comments.textAddReply": "Añadir respuesta", "Common.Views.Comments.textAnonym": "Visitante", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index 8581debd5..f40457284 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -8,9 +8,9 @@ "Common.UI.ComboDataView.emptyComboText": "Aucun style", "Common.UI.ExtendedColorDialog.addButtonText": "Ajouter", "Common.UI.ExtendedColorDialog.cancelButtonText": "Annuler", - "Common.UI.ExtendedColorDialog.textCurrent": "Actuel", + "Common.UI.ExtendedColorDialog.textCurrent": "Actuelle", "Common.UI.ExtendedColorDialog.textHexErr": "La valeur saisie est incorrecte.
Entrez une valeur de 000000 à FFFFFF.", - "Common.UI.ExtendedColorDialog.textNew": "Nouveau", + "Common.UI.ExtendedColorDialog.textNew": "Nouvelle", "Common.UI.ExtendedColorDialog.textRGBErr": "La valeur saisie est incorrecte.
Entrez une valeur numérique de 0 à 255.", "Common.UI.HSBColorPicker.textNoColor": "Pas de couleur", "Common.UI.SearchDialog.textHighlight": "Surligner les résultats", @@ -51,8 +51,8 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Envoyer", "Common.Views.Comments.textAdd": "Ajouter", - "Common.Views.Comments.textAddComment": "Ajouter un commentaire", - "Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au Document", + "Common.Views.Comments.textAddComment": "Ajouter", + "Common.Views.Comments.textAddCommentToDoc": "Ajouter un commentaire au document", "Common.Views.Comments.textAddReply": "Ajouter une réponse", "Common.Views.Comments.textAnonym": "Invité", "Common.Views.Comments.textCancel": "Annuler", @@ -891,7 +891,7 @@ "SSE.Views.DocumentHolder.textFreezePanes": "Verrouiller les volets", "SSE.Views.DocumentHolder.textUnFreezePanes": "Dégager les volets", "SSE.Views.DocumentHolder.topCellText": "Aligner en haut", - "SSE.Views.DocumentHolder.txtAddComment": "Ajouter un commentaire", + "SSE.Views.DocumentHolder.txtAddComment": "Ajouter commentaire", "SSE.Views.DocumentHolder.txtAddNamedRange": "Définir un nom", "SSE.Views.DocumentHolder.txtArrange": "Organiser", "SSE.Views.DocumentHolder.txtAscending": "Croissant", @@ -1124,13 +1124,13 @@ "SSE.Views.NameManagerDlg.textDataRange": "Plage de données", "SSE.Views.NameManagerDlg.textDelete": "Supprimer", "SSE.Views.NameManagerDlg.textEdit": "Modifier", - "SSE.Views.NameManagerDlg.textEmpty": "No named ranges have been created yet.
Create at least one named range and it will appear in this field.", + "SSE.Views.NameManagerDlg.textEmpty": "Aucune plage nommée n’a encore été créée.
Créez au moins une plage nommée et elle va apparaître dans ce champ.", "SSE.Views.NameManagerDlg.textFilter": "Filtre", "SSE.Views.NameManagerDlg.textFilterAll": "Tout", "SSE.Views.NameManagerDlg.textFilterDefNames": "Les noms définis", - "SSE.Views.NameManagerDlg.textFilterSheet": "Les noms sont attachés à la feuille", + "SSE.Views.NameManagerDlg.textFilterSheet": "Noms inclus dans l'étendue de la feuille", "SSE.Views.NameManagerDlg.textFilterTableNames": "Table names", - "SSE.Views.NameManagerDlg.textFilterWorkbook": "Les noms sont attachés àu classeur", + "SSE.Views.NameManagerDlg.textFilterWorkbook": "Noms inclus dans l'étendue du classeur", "SSE.Views.NameManagerDlg.textNew": "Nouveau", "SSE.Views.NameManagerDlg.textnoNames": "Pas de plages nommées correspondant à votre filtre n'a pu être trouvée.", "SSE.Views.NameManagerDlg.textRanges": "Plages nommées", @@ -1362,7 +1362,7 @@ "SSE.Views.TextArtSettings.strForeground": "Couleur de premier plan", "SSE.Views.TextArtSettings.strPattern": "Modèle", "SSE.Views.TextArtSettings.strSize": "Taille", - "SSE.Views.TextArtSettings.strStroke": "Stroke", + "SSE.Views.TextArtSettings.strStroke": "Trait", "SSE.Views.TextArtSettings.strTransparency": "Opacité", "SSE.Views.TextArtSettings.strType": "Type", "SSE.Views.TextArtSettings.textBorderSizeErr": "La valeur saisie est incorrecte.
Entrez une valeur de 0 à 1584 points.", diff --git a/apps/spreadsheeteditor/main/locale/lv.json b/apps/spreadsheeteditor/main/locale/lv.json index 32743f025..ace77b8f0 100644 --- a/apps/spreadsheeteditor/main/locale/lv.json +++ b/apps/spreadsheeteditor/main/locale/lv.json @@ -46,7 +46,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Sūtīt", "Common.Views.Comments.textAdd": "Pievienot", - "Common.Views.Comments.textAddComment": "Pievienot komentāru", + "Common.Views.Comments.textAddComment": "Pievienot", "Common.Views.Comments.textAddCommentToDoc": "Pievienot komentāru dokumentam", "Common.Views.Comments.textAddReply": "Pievienot atbildi", "Common.Views.Comments.textAnonym": "Viesis", diff --git a/apps/spreadsheeteditor/main/locale/pt.json b/apps/spreadsheeteditor/main/locale/pt.json index ba232175f..5d8dc2ce7 100644 --- a/apps/spreadsheeteditor/main/locale/pt.json +++ b/apps/spreadsheeteditor/main/locale/pt.json @@ -46,7 +46,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Enviar", "Common.Views.Comments.textAdd": "Adicionar", - "Common.Views.Comments.textAddComment": "Adicionar comentário", + "Common.Views.Comments.textAddComment": "Adicionar", "Common.Views.Comments.textAddCommentToDoc": "Adicionar comentário ao documento", "Common.Views.Comments.textAddReply": "Adicionar resposta", "Common.Views.Comments.textAnonym": "Visitante", diff --git a/apps/spreadsheeteditor/main/locale/sl.json b/apps/spreadsheeteditor/main/locale/sl.json index 3c8882ec0..df3ba7482 100644 --- a/apps/spreadsheeteditor/main/locale/sl.json +++ b/apps/spreadsheeteditor/main/locale/sl.json @@ -46,7 +46,7 @@ "Common.Views.AdvancedSettingsWindow.okButtonText": "OK", "Common.Views.Chat.textSend": "Pošlji", "Common.Views.Comments.textAdd": "Dodaj", - "Common.Views.Comments.textAddComment": "Dodaj komentar", + "Common.Views.Comments.textAddComment": "Dodaj", "Common.Views.Comments.textAddCommentToDoc": "K dokumentu dodaj komentar", "Common.Views.Comments.textAddReply": "Dodaj odgovor", "Common.Views.Comments.textAnonym": "Gost", From 22a5046f0a60a0fdbd23e257f260729c4eecf24b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 9 Nov 2016 14:07:49 +0300 Subject: [PATCH 29/36] [SSE] Bug 33287. --- apps/spreadsheeteditor/main/app/controller/Main.js | 7 ++++++- apps/spreadsheeteditor/main/locale/en.json | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index c4d0ee376..b88943fcd 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1166,6 +1166,10 @@ define([ config.msg = this.errorCopyMultiselectArea; break; + case Asc.c_oAscError.ID.PrintMaxPagesCount: + config.msg = this.errorPrintMaxPagesCount; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -2002,7 +2006,8 @@ define([ titleLicenseExp: 'License expired', openErrorText: 'An error has occurred while opening the file', saveErrorText: 'An error has occurred while saving the file', - errorCopyMultiselectArea: 'This command cannot be used with multiple selections.
Select a single range and try again.' + errorCopyMultiselectArea: 'This command cannot be used with multiple selections.
Select a single range and try again.', + errorPrintMaxPagesCount: 'Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.
This restriction will be eliminated in upcoming releases.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index cd03e3aa8..2426575d0 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -249,6 +249,7 @@ "SSE.Controllers.Main.errorOpenWarning": "The length of one of the formulas in the file exceeded
the allowed number of characters and it was removed.", "SSE.Controllers.Main.errorOperandExpected": "The entered function syntax is not correct. Please check if you are missing one of the parentheses - '(' or ')'.", "SSE.Controllers.Main.errorPasteMaxRange": "The copy and paste area does not match.
Please select an area with the same size or click the first cell in a row to paste the copied cells.", + "SSE.Controllers.Main.errorPrintMaxPagesCount": "Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.
This restriction will be eliminated in upcoming releases.", "SSE.Controllers.Main.errorProcessSaveResult": "Saving failed", "SSE.Controllers.Main.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:
opening price, max price, min price, closing price.", "SSE.Controllers.Main.errorUnexpectedGuid": "External error.
Unexpected GUID. Please contact support in case the error persists.", From 8933204f73f4fafa247bd48caaa9a4928271aecd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 9 Nov 2016 14:36:29 +0300 Subject: [PATCH 30/36] [DE] Optimizing less files. --- apps/common/main/lib/view/ReviewChanges.js | 6 +++--- apps/common/main/resources/less/asc-mixins.less | 8 +++++--- apps/common/main/resources/less/review-changes.less | 5 ----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index c599abfaa..9e81f450c 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -447,7 +447,7 @@ define([ this.btnPrev = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'review-prev', + iconCls: 'img-commonctrl review-prev', value: 1, hint: this.txtPrev, hintAnchor: 'top' @@ -456,7 +456,7 @@ define([ this.btnNext = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'review-next', + iconCls: 'img-commonctrl review-next', value: 2, hint: this.txtNext, hintAnchor: 'top' @@ -507,7 +507,7 @@ define([ this.btnClose = new Common.UI.Button({ cls: 'btn-toolbar', - iconCls: 'review-close', + iconCls: 'img-commonctrl review-close', hint: this.txtClose, hintAnchor: 'top' }); diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less index 382d03dbf..a2ad4d6ca 100644 --- a/apps/common/main/resources/less/asc-mixins.less +++ b/apps/common/main/resources/less/asc-mixins.less @@ -137,9 +137,11 @@ } @common-controls-width: 100px; -.img-commonctrl, - .theme-colorpalette .color-transparent, .palette-color-ext .color-transparent, .dropdown-menu li .checked:before, .input-error:before { - background: e(%("url(%s)",'@{common-image-path}/@{common-controls}')) no-repeat; +.img-commonctrl, + .theme-colorpalette .color-transparent, .palette-color-ext .color-transparent, .dropdown-menu li .checked:before, .input-error:before, + .btn-toolbar .btn-icon.img-commonctrl { + background-image: e(%("url(%s)",'@{common-image-path}/@{common-controls}')); + background-repeat: no-repeat; @media only screen and (-webkit-min-device-pixel-ratio: 2), diff --git a/apps/common/main/resources/less/review-changes.less b/apps/common/main/resources/less/review-changes.less index 353b5be01..68c96b186 100644 --- a/apps/common/main/resources/less/review-changes.less +++ b/apps/common/main/resources/less/review-changes.less @@ -41,11 +41,6 @@ height: 19px; } - .btn-toolbar { - span.btn-icon { - .background-ximage('@{common-image-path}/@{common-controls}', '@{common-image-path}/@{common-controls2x}', 100px); - } - } .review-prev {background-position: -40px -250px;} button.active > .review-prev, button:active > .review-prev {background-position: -60px -250px !important;} From 9fcf4dcb91f54fd669cbfd46fe6cfcf13e57ad12 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 10 Nov 2016 10:19:17 +0300 Subject: [PATCH 31/36] [SSE] Fix Bug 33365. --- apps/spreadsheeteditor/main/app/view/Statusbar.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index 044e28033..dc35cb971 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -244,7 +244,17 @@ define([ }); var menuHiddenItems = new Common.UI.Menu({ + maxHeight: 260, menuAlign: 'tl-tr' + }).on('render:after', function(mnu) { + this.scroller = new Common.UI.Scroller({ + el: $(this.el).find('.dropdown-menu '), + useKeyboard: this.enableKeyEvents && !this.handleSelect, + minScrollbarLength : 40, + alwaysVisibleY: true + }); + }).on('show:after', function () { + this.scroller.update({alwaysVisibleY: true}); }); menuHiddenItems.on('item:click', function(obj,item,e) { me.fireEvent('show:hidden', [me, item.value]); From deb469bb837b4fc368c0ccc66095d7ff5efb0015 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 10 Nov 2016 10:47:35 +0300 Subject: [PATCH 32/36] [SSE] Change layout for chart settings in the right panel, remove chart style from the advanced chart settings. --- .../main/resources/less/combo-dataview.less | 48 +++---- .../main/app/template/ChartSettings.template | 18 +-- .../app/template/ChartSettingsDlg.template | 6 +- .../main/app/view/ChartSettings.js | 131 +++++++----------- .../main/app/view/ChartSettingsDlg.js | 99 ------------- 5 files changed, 84 insertions(+), 218 deletions(-) diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 04190efbf..9058c3c4f 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -199,9 +199,8 @@ .combo-template(64px); } -.combo-pattern { +.combo-textart(@combo-dataview-height: 62px, @combo-dataview-item-margins: 4px) { @combo-dataview-button-width: 15px; - @combo-dataview-height: 40px; height: @combo-dataview-height; @@ -216,16 +215,8 @@ } .item { - margin: 4px 0 4px 4px; + margin: @combo-dataview-item-margins 0 @combo-dataview-item-margins @combo-dataview-item-margins; .box-shadow(none); - - &:hover { - .box-shadow(0 0 0 1px @gray); - } - -// &.selected { -// .box-shadow(0 0 0 2px @primary); -// } } &.disabled { @@ -235,6 +226,16 @@ } } } +}; + +.combo-pattern { + .combo-textart(40px); + + .item { + &:hover { + .box-shadow(0 0 0 1px @gray); + } + } .dropdown-menu { padding-right: 2px; @@ -247,31 +248,22 @@ }; .combo-textart { - @combo-dataview-button-width: 15px; - @combo-dataview-height: 62px; + .combo-textart(); +} - height: @combo-dataview-height; - - .view { - margin-right: -@combo-dataview-button-width; - padding-right: @combo-dataview-button-width; - } - - .button { - width: @combo-dataview-button-width; - height: @combo-dataview-height; - } +.combo-chart-style { + .combo-textart(58px, 2px); .item { - margin: 4px 0 4px 4px; - .box-shadow(none); + margin-left: 4px; + .box-shadow(0 0 0 1px @gray); } &.disabled { .item { &:hover:not(.selected) { - .box-shadow(none); + .box-shadow(0 0 0 1px @gray); } } } -}; +} \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/template/ChartSettings.template b/apps/spreadsheeteditor/main/app/template/ChartSettings.template index f91491b05..74fca39ff 100644 --- a/apps/spreadsheeteditor/main/app/template/ChartSettings.template +++ b/apps/spreadsheeteditor/main/app/template/ChartSettings.template @@ -18,9 +18,9 @@ - +
- @@ -29,29 +29,31 @@
+ + - - - - diff --git a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template index 41d60a7e7..4dbbe03c6 100644 --- a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template +++ b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template @@ -1,15 +1,11 @@
-
+
- -
+ +
+
+
+
+
+
-
- -
-
diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index d4c8f019e..1ff0d0eb9 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -45,6 +45,7 @@ define([ 'backbone', 'common/main/lib/component/Button', 'common/main/lib/component/MetricSpinner', + 'common/main/lib/component/ComboDataView', 'spreadsheeteditor/main/app/view/ChartSettingsDlg' ], function (menuTemplate, $, _, Backbone) { 'use strict'; @@ -138,22 +139,27 @@ define([ value = props.asc_getSeveralChartStyles(); if (this._state.SeveralCharts && value) { - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', 'none'); - this.mnuChartStylePicker.selectRecord(null, true); + this.cmbChartStyle.fieldPicker.deselectAll(); + this.cmbChartStyle.menuPicker.deselectAll(); this._state.ChartStyle = null; } else { value = this.chartProps.getStyle(); - if (this._state.ChartStyle!==value) { - var record = this.mnuChartStylePicker.store.findWhere({data: value}); - this.mnuChartStylePicker.selectRecord(record, true); - if (record) { - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', 'url(' + record.get('imageUrl') + ')'); + if (this._state.ChartStyle!==value || this._isChartStylesChanged) { + this.cmbChartStyle.suspendEvents(); + var rec = this.cmbChartStyle.menuPicker.store.findWhere({data: value}); + this.cmbChartStyle.menuPicker.selectRecord(rec); + this.cmbChartStyle.resumeEvents(); + + if (this._isChartStylesChanged) { + if (rec) + this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true); + else + this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true); } this._state.ChartStyle=value; } } + this._isChartStylesChanged = false; this._noApply = false; @@ -457,30 +463,12 @@ define([ Common.NotificationCenter.trigger('edit:complete', this); }, - onSelectStyle: function(btn, picker, itemView, record) { + onSelectStyle: function(combo, record) { if (this._noApply) return; - var rawData = {}, - isPickerSelect = _.isFunction(record.toJSON); - - if (isPickerSelect){ - if (record.get('selected')) { - rawData = record.toJSON(); - } else { - // record deselected - return; - } - } else { - rawData = record; - } - - var style = 'url(' + rawData.imageUrl + ')'; - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', style); - if (this.api && !this._noApply && this.chartProps) { var props = new Asc.asc_CImgProperty(); - this.chartProps.putStyle(rawData.data); + this.chartProps.putStyle(record.get('data')); props.asc_putChartProperties(this.chartProps); this.api.asc_setGraphicObjectProps(props); } @@ -494,64 +482,51 @@ define([ updateChartStyles: function(styles) { var me = this; + this._isChartStylesChanged = true; - if (!this.btnChartStyle) { - this.btnChartStyle = new Common.UI.Button({ - cls : 'btn-large-dataview', - iconCls : 'item-wrap', - menu : new Common.UI.Menu({ - menuAlign: 'tr-br', - items: [ - { template: _.template('
') } - ] - }) + if (!this.cmbChartStyle) { + this.cmbChartStyle = new Common.UI.ComboDataView({ + itemWidth: 50, + itemHeight: 50, + menuMaxHeight: 270, + enableKeyEvents: true, + cls: 'combo-chart-style' }); - this.btnChartStyle.render($('#chart-button-style')); - this.lockedControls.push(this.btnChartStyle); - this.mnuChartStylePicker = new Common.UI.DataView({ - el: $('#id-chart-menu-style'), - style: 'max-height: 411px;', - parentMenu: this.btnChartStyle.menu, - store: new Common.UI.DataViewStore(), - itemTemplate: _.template('
') + this.cmbChartStyle.render($('#chart-combo-style')); + this.cmbChartStyle.openButton.menu.cmpEl.css({ + 'min-width': 178, + 'max-width': 178 }); - - if (this.btnChartStyle.menu) { - this.btnChartStyle.menu.on('show:after', function () { - me.mnuChartStylePicker.scroller.update({alwaysVisibleY: true}); - }); - } - this.mnuChartStylePicker.on('item:click', _.bind(this.onSelectStyle, this, this.btnChartStyle)); + this.cmbChartStyle.on('click', _.bind(this.onSelectStyle, this)); + this.cmbChartStyle.openButton.menu.on('show:after', function () { + me.cmbChartStyle.menuPicker.scroller.update({alwaysVisibleY: true}); + }); + this.lockedControls.push(this.cmbChartStyle); } - + if (styles && styles.length>0){ - var stylesStore = this.mnuChartStylePicker.store; + var stylesStore = this.cmbChartStyle.menuPicker.store; if (stylesStore) { - var stylearray = [], - selectedIdx = -1, - selectedUrl; - _.each(styles, function(item, index){ - stylearray.push({ - imageUrl: item.asc_getImageUrl(), - data : item.asc_getStyle(), - tip : me.textStyle + ' ' + item.asc_getStyle() + var count = stylesStore.length; + if (count>0 && count==styles.length) { + var data = stylesStore.models; + _.each(styles, function(style, index){ + data[index].set('imageUrl', style.asc_getImageUrl()); }); - if (me._state.ChartStyle == item.asc_getStyle()) { - selectedIdx = index; - selectedUrl = item.asc_getImageUrl(); - } - - }); - - stylesStore.reset(stylearray, {silent: false}); + } else { + var stylearray = [], + selectedIdx = -1; + _.each(styles, function(item, index){ + stylearray.push({ + imageUrl: item.asc_getImageUrl(), + data : item.asc_getStyle(), + tip : me.textStyle + ' ' + item.asc_getStyle() + }); + }); + stylesStore.reset(stylearray, {silent: false}); + } } } - this.mnuChartStylePicker.selectByIndex(selectedIdx, true); - if (selectedIdx>=0 && this.btnChartStyle.cmpEl) { - var style = 'url(' + selectedUrl + ')'; - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', style); - } }, setLocked: function (locked) { diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index 5200a82ae..31eb1f28a 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -79,7 +79,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); this._state = { - ChartStyle: 1, ChartType: Asc.c_oAscChartTypeSettings.barNormal }; this._noApply = true; @@ -174,34 +173,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.btnChartType.render($('#chart-dlg-button-type')); this.mnuChartTypePicker.on('item:click', _.bind(this.onSelectType, this, this.btnChartType)); - this.btnChartStyle = new Common.UI.Button({ - cls : 'btn-large-dataview', - iconCls : 'item-wrap', - menu : new Common.UI.Menu({ - additionalAlign: menuAddAlign, - items: [ - { template: _.template('
') } - ] - }) - }); - this.btnChartStyle.on('render:after', function(btn) { - me.mnuChartStylePicker = new Common.UI.DataView({ - el: $('#id-chart-dlg-menu-style'), - parentMenu: btn.menu, - style: 'max-height: 411px;', - store: new Common.UI.DataViewStore(), - itemTemplate: _.template('
') - }); - - if (me.btnChartStyle.menu) { - me.btnChartStyle.menu.on('show:after', function () { - me.mnuChartStylePicker.scroller.update({alwaysVisibleY: true}); - }); - } - }); - this.btnChartStyle.render($('#chart-dlg-button-style')); - this.mnuChartStylePicker.on('item:click', _.bind(this.onSelectStyle, this, this.btnChartStyle)); - this.cmbDataDirect = new Common.UI.ComboBox({ el : $('#chart-dlg-combo-range'), menuStyle : 'min-width: 120px;', @@ -804,9 +775,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' afterRender: function() { - if (this.api) - this.updateChartStyles(this.api.asc_getChartPreviews(this._state.ChartType)); - this._setDefaults(this.chartSettings); if (this.storageName) { var value = Common.localStorage.getItem(this.storageName); @@ -835,7 +803,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' } this.btnChartType.setIconCls('item-chartlist ' + rawData.iconCls); - this.updateChartStyles(this.api.asc_getChartPreviews(rawData.type)); this.chartSettings.changeType(rawData.type); this.updateAxisProps(rawData.type, true); this.vertAxisProps = this.chartSettings.getVertAxisProps(); @@ -1018,62 +985,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.currentAxisProps = props; }, - onSelectStyle: function(btn, picker, itemView, record) { - if (this._noApply) return; - - var rawData = {}, - isPickerSelect = _.isFunction(record.toJSON); - - if (isPickerSelect){ - if (record.get('selected')) { - rawData = record.toJSON(); - } else { - // record deselected - return; - } - } else { - rawData = record; - } - - var style = 'url(' + rawData.imageUrl + ')'; - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', style); - - this._state.ChartStyle = rawData.data; - }, - - updateChartStyles: function(styles) { - var me = this; - if (styles && styles.length>0){ - var stylesStore = this.mnuChartStylePicker.store; - if (stylesStore) { - var stylearray = [], - selectedIdx = -1, - selectedUrl; - _.each(styles, function(item, index){ - stylearray.push({ - imageUrl: item.asc_getImageUrl(), - data : item.asc_getStyle(), - tip : me.textStyle + ' ' + item.asc_getStyle() - }); - if (me._state.ChartStyle == item.asc_getStyle()) { - selectedIdx = index; - selectedUrl = item.asc_getImageUrl(); - } - - }); - - stylesStore.reset(stylearray, {silent: false}); - } - } - this.mnuChartStylePicker.selectByIndex(selectedIdx, true); - if (selectedIdx>=0 && this.btnChartStyle.cmpEl) { - var style = 'url(' + selectedUrl + ')'; - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', style); - } - }, - _setDefaults: function(props) { var me = this; if (props ){ @@ -1090,18 +1001,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' if (record) { this.btnChartType.setIconCls('item-chartlist ' + record.get('iconCls')); } - this.updateChartStyles(this.api.asc_getChartPreviews(this._state.ChartType)); this._noApply = false; - this._state.ChartStyle = props.getStyle(); - record = this.mnuChartStylePicker.store.findWhere({data: this._state.ChartStyle}); - this.mnuChartStylePicker.selectRecord(record, true); - if (record) { - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', 'url(' + record.get('imageUrl') + ')'); - } - var value = props.getRange(); this.txtDataRange.setValue((value) ? value : ''); this.dataRangeValid = value; @@ -1151,7 +1053,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' // Layout this.chartSettings.putType(type); - this.chartSettings.putStyle(this._state.ChartStyle); this.chartSettings.putInColumns(this.cmbDataDirect.getValue()==1); this.chartSettings.putRange(this.txtDataRange.getValue()); From 46ebd78757e92a268ebc8a6a95ca7ba6e9af95ad Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 10 Nov 2016 11:01:30 +0300 Subject: [PATCH 33/36] [SSE] Fixed Bug 33367. --- apps/common/main/lib/component/MenuItem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/MenuItem.js b/apps/common/main/lib/component/MenuItem.js index 5e0fe94d2..5814ed658 100644 --- a/apps/common/main/lib/component/MenuItem.js +++ b/apps/common/main/lib/component/MenuItem.js @@ -337,7 +337,7 @@ define([ me.cmpEl.removeClass('over'); }, 200); - if (e.type !== 'focusout') { // when mouseleave from clicked menu item with submenu + if (e && e.type !== 'focusout') { // when mouseleave from clicked menu item with submenu var focused = me.cmpEl.children(':focus'); if (focused.length>0) { focused.blur(); From 3134a3f73c1810c28d97bf01216ff2987d2c2e54 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 10 Nov 2016 12:37:28 +0300 Subject: [PATCH 34/36] [DE] [PE] Change layout for chart settings in the right panel. --- .../main/app/template/ChartSettings.template | 8 +- .../main/app/view/ChartSettings.js | 130 +++++++---------- .../main/app/template/ChartSettings.template | 14 +- .../main/app/view/ChartSettings.js | 132 +++++++----------- 4 files changed, 118 insertions(+), 166 deletions(-) diff --git a/apps/documenteditor/main/app/template/ChartSettings.template b/apps/documenteditor/main/app/template/ChartSettings.template index 54b76e318..409261c55 100644 --- a/apps/documenteditor/main/app/template/ChartSettings.template +++ b/apps/documenteditor/main/app/template/ChartSettings.template @@ -38,11 +38,13 @@ - +
- -
+ + + +
diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index 1eba1e243..08ca005e6 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -44,6 +44,7 @@ define([ 'underscore', 'backbone', 'common/main/lib/component/Button', + 'common/main/lib/component/ComboDataView', 'documenteditor/main/app/view/ImageSettingsAdvanced' ], function (menuTemplate, $, _, Backbone) { 'use strict'; @@ -152,22 +153,27 @@ define([ value = props.get_SeveralChartStyles(); if (this._state.SeveralCharts && value) { - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', 'none'); - this.mnuChartStylePicker.selectRecord(null, true); + this.cmbChartStyle.fieldPicker.deselectAll(); + this.cmbChartStyle.menuPicker.deselectAll(); this._state.ChartStyle = null; } else { value = this.chartProps.getStyle(); - if (this._state.ChartStyle!==value) { - var record = this.mnuChartStylePicker.store.findWhere({data: value}); - this.mnuChartStylePicker.selectRecord(record, true); - if (record) { - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', 'url(' + record.get('imageUrl') + ')'); + if (this._state.ChartStyle!==value || this._isChartStylesChanged) { + this.cmbChartStyle.suspendEvents(); + var rec = this.cmbChartStyle.menuPicker.store.findWhere({data: value}); + this.cmbChartStyle.menuPicker.selectRecord(rec); + this.cmbChartStyle.resumeEvents(); + + if (this._isChartStylesChanged) { + if (rec) + this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true); + else + this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true); } this._state.ChartStyle=value; } } + this._isChartStylesChanged = false; this._noApply = false; @@ -443,34 +449,15 @@ define([ this.fireEvent('editcomplete', this); }, - onSelectStyle: function(btn, picker, itemView, record) { + onSelectStyle: function(combo, record) { if (this._noApply) return; - var rawData = {}, - isPickerSelect = _.isFunction(record.toJSON); - - if (isPickerSelect){ - if (record.get('selected')) { - rawData = record.toJSON(); - } else { - // record deselected - return; - } - } else { - rawData = record; - } - - var style = 'url(' + rawData.imageUrl + ')'; - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', style); - if (this.api && !this._noApply && this.chartProps) { var props = new Asc.asc_CImgProperty(); - this.chartProps.putStyle(rawData.data); + this.chartProps.putStyle(record.get('data')); props.put_ChartProperties(this.chartProps); this.api.ImgApply(props); } - this.fireEvent('editcomplete', this); }, @@ -481,64 +468,51 @@ define([ updateChartStyles: function(styles) { var me = this; + this._isChartStylesChanged = true; - if (!this.btnChartStyle) { - this.btnChartStyle = new Common.UI.Button({ - cls : 'btn-large-dataview', - iconCls : 'item-wrap', - menu : new Common.UI.Menu({ - menuAlign: 'tr-br', - items: [ - { template: _.template('
') } - ] - }) + if (!this.cmbChartStyle) { + this.cmbChartStyle = new Common.UI.ComboDataView({ + itemWidth: 50, + itemHeight: 50, + menuMaxHeight: 270, + enableKeyEvents: true, + cls: 'combo-chart-style' }); - this.btnChartStyle.render($('#chart-button-style')); - this.lockedControls.push(this.btnChartStyle); - this.mnuChartStylePicker = new Common.UI.DataView({ - el: $('#id-chart-menu-style'), - style: 'max-height: 411px;', - parentMenu: this.btnChartStyle.menu, - store: new Common.UI.DataViewStore(), - itemTemplate: _.template('
') + this.cmbChartStyle.render($('#chart-combo-style')); + this.cmbChartStyle.openButton.menu.cmpEl.css({ + 'min-width': 178, + 'max-width': 178 }); - - if (this.btnChartStyle.menu) { - this.btnChartStyle.menu.on('show:after', function () { - me.mnuChartStylePicker.scroller.update({alwaysVisibleY: true}); - }); - } - this.mnuChartStylePicker.on('item:click', _.bind(this.onSelectStyle, this, this.btnChartStyle)); + this.cmbChartStyle.on('click', _.bind(this.onSelectStyle, this)); + this.cmbChartStyle.openButton.menu.on('show:after', function () { + me.cmbChartStyle.menuPicker.scroller.update({alwaysVisibleY: true}); + }); + this.lockedControls.push(this.cmbChartStyle); } if (styles && styles.length>0){ - var stylesStore = this.mnuChartStylePicker.store; + var stylesStore = this.cmbChartStyle.menuPicker.store; if (stylesStore) { - var stylearray = [], - selectedIdx = -1, - selectedUrl; - _.each(styles, function(item, index){ - stylearray.push({ - imageUrl: item.asc_getImageUrl(), - data : item.asc_getStyle(), - tip : me.textStyle + ' ' + item.asc_getStyle() + var count = stylesStore.length; + if (count>0 && count==styles.length) { + var data = stylesStore.models; + _.each(styles, function(style, index){ + data[index].set('imageUrl', style.asc_getImageUrl()); }); - if (me._state.ChartStyle == item.asc_getStyle()) { - selectedIdx = index; - selectedUrl = item.asc_getImageUrl(); - } - - }); - - stylesStore.reset(stylearray, {silent: false}); + } else { + var stylearray = [], + selectedIdx = -1; + _.each(styles, function(item, index){ + stylearray.push({ + imageUrl: item.asc_getImageUrl(), + data : item.asc_getStyle(), + tip : me.textStyle + ' ' + item.asc_getStyle() + }); + }); + stylesStore.reset(stylearray, {silent: false}); + } } } - this.mnuChartStylePicker.selectByIndex(selectedIdx, true); - if (selectedIdx>=0 && this.btnChartStyle.cmpEl) { - var style = 'url(' + selectedUrl + ')'; - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', style); - } }, setLocked: function (locked) { diff --git a/apps/presentationeditor/main/app/template/ChartSettings.template b/apps/presentationeditor/main/app/template/ChartSettings.template index 6e18ad1ed..e6fcb591e 100644 --- a/apps/presentationeditor/main/app/template/ChartSettings.template +++ b/apps/presentationeditor/main/app/template/ChartSettings.template @@ -18,14 +18,14 @@ - +
- - @@ -33,17 +33,19 @@ + + - - diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index 9eb840695..80ab24a9c 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -43,7 +43,8 @@ define([ 'jquery', 'underscore', 'backbone', - 'common/main/lib/component/Button' + 'common/main/lib/component/Button', + 'common/main/lib/component/ComboDataView' ], function (menuTemplate, $, _, Backbone) { 'use strict'; @@ -134,22 +135,27 @@ define([ value = props.get_SeveralChartStyles(); if (this._state.SeveralCharts && value) { - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', 'none'); - this.mnuChartStylePicker.selectRecord(null, true); + this.cmbChartStyle.fieldPicker.deselectAll(); + this.cmbChartStyle.menuPicker.deselectAll(); this._state.ChartStyle = null; } else { value = props.getStyle(); - if (this._state.ChartStyle!==value) { - var record = this.mnuChartStylePicker.store.findWhere({data: value}); - this.mnuChartStylePicker.selectRecord(record, true); - if (record) { - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', 'url(' + record.get('imageUrl') + ')'); + if (this._state.ChartStyle!==value || this._isChartStylesChanged) { + this.cmbChartStyle.suspendEvents(); + var rec = this.cmbChartStyle.menuPicker.store.findWhere({data: value}); + this.cmbChartStyle.menuPicker.selectRecord(rec); + this.cmbChartStyle.resumeEvents(); + + if (this._isChartStylesChanged) { + if (rec) + this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.getSelectedRec(),true); + else + this.cmbChartStyle.fillComboView(this.cmbChartStyle.menuPicker.store.at(0), true); } this._state.ChartStyle=value; } } + this._isChartStylesChanged = false; this._noApply = false; @@ -352,33 +358,14 @@ define([ this.fireEvent('editcomplete', this); }, - onSelectStyle: function(btn, picker, itemView, record) { + onSelectStyle: function(combo, record) { if (this._noApply) return; - var rawData = {}, - isPickerSelect = _.isFunction(record.toJSON); - - if (isPickerSelect){ - if (record.get('selected')) { - rawData = record.toJSON(); - } else { - // record deselected - return; - } - } else { - rawData = record; - } - - var style = 'url(' + rawData.imageUrl + ')'; - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', style); - if (this.api && !this._noApply) { var props = new Asc.CAscChartProp(); - props.putStyle(rawData.data); + props.putStyle(record.get('data')); this.api.ChartApply(props); } - this.fireEvent('editcomplete', this); }, @@ -389,64 +376,51 @@ define([ updateChartStyles: function(styles) { var me = this; + this._isChartStylesChanged = true; - if (!this.btnChartStyle) { - this.btnChartStyle = new Common.UI.Button({ - cls : 'btn-large-dataview', - iconCls : 'item-wrap', - menu : new Common.UI.Menu({ - menuAlign: 'tr-br', - items: [ - { template: _.template('
') } - ] - }) + if (!this.cmbChartStyle) { + this.cmbChartStyle = new Common.UI.ComboDataView({ + itemWidth: 50, + itemHeight: 50, + menuMaxHeight: 270, + enableKeyEvents: true, + cls: 'combo-chart-style' }); - this.btnChartStyle.render($('#chart-button-style')); - this.lockedControls.push(this.btnChartStyle); - this.mnuChartStylePicker = new Common.UI.DataView({ - el: $('#id-chart-menu-style'), - style: 'max-height: 411px;', - parentMenu: this.btnChartStyle.menu, - store: new Common.UI.DataViewStore(), - itemTemplate: _.template('
') + this.cmbChartStyle.render($('#chart-combo-style')); + this.cmbChartStyle.openButton.menu.cmpEl.css({ + 'min-width': 178, + 'max-width': 178 }); - - if (this.btnChartStyle.menu) { - this.btnChartStyle.menu.on('show:after', function () { - me.mnuChartStylePicker.scroller.update({alwaysVisibleY: true}); - }); - } - this.mnuChartStylePicker.on('item:click', _.bind(this.onSelectStyle, this, this.btnChartStyle)); + this.cmbChartStyle.on('click', _.bind(this.onSelectStyle, this)); + this.cmbChartStyle.openButton.menu.on('show:after', function () { + me.cmbChartStyle.menuPicker.scroller.update({alwaysVisibleY: true}); + }); + this.lockedControls.push(this.cmbChartStyle); } if (styles && styles.length>0){ - var stylesStore = this.mnuChartStylePicker.store; + var stylesStore = this.cmbChartStyle.menuPicker.store; if (stylesStore) { - var stylearray = [], - selectedIdx = -1, - selectedUrl; - _.each(styles, function(item, index){ - stylearray.push({ - imageUrl: item.asc_getImageUrl(), - data : item.asc_getStyle(), - tip : me.textStyle + ' ' + item.asc_getStyle() + var count = stylesStore.length; + if (count>0 && count==styles.length) { + var data = stylesStore.models; + _.each(styles, function(style, index){ + data[index].set('imageUrl', style.asc_getImageUrl()); }); - if (me._state.ChartStyle == item.asc_getStyle()) { - selectedIdx = index; - selectedUrl = item.asc_getImageUrl(); - } - - }); - - stylesStore.reset(stylearray, {silent: false}); + } else { + var stylearray = [], + selectedIdx = -1; + _.each(styles, function(item, index){ + stylearray.push({ + imageUrl: item.asc_getImageUrl(), + data : item.asc_getStyle(), + tip : me.textStyle + ' ' + item.asc_getStyle() + }); + }); + stylesStore.reset(stylearray, {silent: false}); + } } } - this.mnuChartStylePicker.selectByIndex(selectedIdx, true); - if (selectedIdx>=0 && this.btnChartStyle.cmpEl) { - var style = 'url(' + selectedUrl + ')'; - var btnIconEl = this.btnChartStyle.cmpEl.find('span.btn-icon'); - btnIconEl.css('background-image', style); - } }, onWidthChange: function(field, newValue, oldValue, eOpts){ From 4f491a750c4b57b0d9f767371e6e191eb3c82912 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Thu, 10 Nov 2016 14:24:18 +0300 Subject: [PATCH 35/36] c_oAscVerticalTextAlign -> c_oAscVAlign TEXT_ALIGN_BOTTOM -> Bottom TEXT_ALIGN_CTR -> Center TEXT_ALIGN_DIST -> Dist TEXT_ALIGN_JUST -> Just TEXT_ALIGN_TOP -> Top --- apps/documenteditor/main/app/view/DocumentHolder.js | 12 ++++++------ .../main/app/controller/Toolbar.js | 6 +++--- .../main/app/view/DocumentHolder.js | 12 ++++++------ apps/presentationeditor/main/app/view/Toolbar.js | 6 +++--- .../main/app/controller/DocumentHolder.js | 6 +++--- .../main/app/view/DocumentHolder.js | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 1dc58890b..7cd5aef47 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2696,21 +2696,21 @@ define([ checkable : true, checked : false, toggleGroup : 'popupparagraphvalign', - valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP + valign : Asc.c_oAscVAlign.Top }).on('click', _.bind(paragraphVAlign, me)), me.menuParagraphCenter = new Common.UI.MenuItem({ caption : me.centerCellText, checkable : true, checked : false, toggleGroup : 'popupparagraphvalign', - valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR + valign : Asc.c_oAscVAlign.Center }).on('click', _.bind(paragraphVAlign, me)), me.menuParagraphBottom = new Common.UI.MenuItem({ caption : me.bottomCellText, checkable : true, checked : false, toggleGroup : 'popupparagraphvalign', - valign : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM + valign : Asc.c_oAscVAlign.Bottom }).on('click', _.bind(paragraphVAlign, me)) ] }) @@ -2915,9 +2915,9 @@ define([ menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !! if ( isInShape || isInChart ) { var align = value.imgProps.value.get_VerticalTextAlign(); - me.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); - me.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); - me.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); + me.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top); + me.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center); + me.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom); var dir = value.imgProps.value.get_Vert(); me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 1fdb231a1..e158fec23 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -466,9 +466,9 @@ define([ btnVerticalAlign = this.toolbar.btnVerticalAlign; switch (v) { - case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP: index = 0; align = 'btn-align-top'; break; - case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR: index = 1; align = 'btn-align-middle'; break; - case Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM: index = 2; align = 'btn-align-bottom'; break; + case Asc.c_oAscVAlign.Top: index = 0; align = 'btn-align-top'; break; + case Asc.c_oAscVAlign.Center: index = 1; align = 'btn-align-middle'; break; + case Asc.c_oAscVAlign.Bottom: index = 2; align = 'btn-align-bottom'; break; default: index = -255; align = 'btn-align-middle'; break; } diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 383ccb65d..e2e712b8b 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2169,19 +2169,19 @@ define([ caption : me.topCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP + value : Asc.c_oAscVAlign.Top }).on('click', _.bind(onItemClick, me)), me.menuParagraphCenter = new Common.UI.MenuItem({ caption : me.centerCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR + value : Asc.c_oAscVAlign.Center }).on('click', _.bind(onItemClick, me)), me.menuParagraphBottom = new Common.UI.MenuItem({ caption : me.bottomCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM + value : Asc.c_oAscVAlign.Bottom }).on('click', _.bind(onItemClick, me)) ] }) @@ -2345,9 +2345,9 @@ define([ menuParagraphDirection.setVisible(isInShape && !isInChart && !isEquation); // после того, как заголовок можно будет растягивать по вертикали, вернуть "|| isInChart" !! if (isInShape || isInChart) { var align = value.shapeProps.value.get_VerticalTextAlign(); - me.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); - me.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); - me.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); + me.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top); + me.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center); + me.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom); var dir = value.shapeProps.value.get_Vert(); me.menuParagraphDirectH.setChecked(dir == Asc.c_oAscVertDrawingText.normal); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 940e6cab5..671606671 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -453,7 +453,7 @@ define([ icls : 'btn-align-top', checkable : true, toggleGroup : 'valignGroup', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP + value : Asc.c_oAscVAlign.Top }, { caption : me.textAlignMiddle, @@ -461,7 +461,7 @@ define([ icls : 'btn-align-middle', checkable : true, toggleGroup : 'valignGroup', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR, + value : Asc.c_oAscVAlign.Center, checked : true }, { @@ -470,7 +470,7 @@ define([ icls : 'btn-align-bottom', checkable : true, toggleGroup : 'valignGroup', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM + value : Asc.c_oAscVAlign.Bottom } ] }) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 1c0671027..4ac3399de 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1216,9 +1216,9 @@ define([ align = value.asc_getVerticalTextAlign(), direct = value.asc_getVert(); isObjLocked = isObjLocked || value.asc_getLocked(); - documentHolder.menuParagraphTop.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP); - documentHolder.menuParagraphCenter.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR); - documentHolder.menuParagraphBottom.setChecked(align == Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM); + documentHolder.menuParagraphTop.setChecked(align == Asc.c_oAscVAlign.Top); + documentHolder.menuParagraphCenter.setChecked(align == Asc.c_oAscVAlign.Center); + documentHolder.menuParagraphBottom.setChecked(align == Asc.c_oAscVAlign.Bottom); documentHolder.menuParagraphDirectH.setChecked(direct == Asc.c_oAscVertDrawingText.normal); documentHolder.menuParagraphDirect90.setChecked(direct == Asc.c_oAscVertDrawingText.vert); diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index 8d2efff01..da1e92db1 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -470,19 +470,19 @@ define([ caption : me.topCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_TOP + value : Asc.c_oAscVAlign.Top }), me.menuParagraphCenter = new Common.UI.MenuItem({ caption : me.centerCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_CTR + value : Asc.c_oAscVAlign.Center }), this.menuParagraphBottom = new Common.UI.MenuItem({ caption : me.bottomCellText, checkable : true, toggleGroup : 'popupparagraphvalign', - value : Asc.c_oAscVerticalTextAlign.TEXT_ALIGN_BOTTOM + value : Asc.c_oAscVAlign.Bottom }) ] }) From ad21492c2989aba5b0d8e09222ca464b738953d6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 10 Nov 2016 15:38:26 +0300 Subject: [PATCH 36/36] Disable toolbar and right panel when lost editing rights (api method denyEditingRights). --- apps/documenteditor/main/app/controller/Main.js | 1 + apps/presentationeditor/main/app/controller/Main.js | 1 + apps/spreadsheeteditor/main/app/controller/Main.js | 1 + 3 files changed, 3 insertions(+) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index fd0dacb1f..31283a5bb 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -320,6 +320,7 @@ define([ this._state.lostEditingRights = !this._state.lostEditingRights; this.api.asc_coAuthoringDisconnect(); this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights(); + Common.NotificationCenter.trigger('api:disconnect'); if (!old_rights) Common.UI.warning({ title: this.notcriticalErrorTitle, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 9a920a62d..24e97d8c8 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -307,6 +307,7 @@ define([ this._state.lostEditingRights = !this._state.lostEditingRights; this.api.asc_coAuthoringDisconnect(); this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights(); + Common.NotificationCenter.trigger('api:disconnect'); if (!old_rights) Common.UI.warning({ title: this.notcriticalErrorTitle, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index b88943fcd..45b59f32e 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -335,6 +335,7 @@ define([ this._state.lostEditingRights = !this._state.lostEditingRights; this.api.asc_coAuthoringDisconnect(); this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights(); + Common.NotificationCenter.trigger('api:disconnect'); if (!old_rights) Common.UI.warning({ title: this.notcriticalErrorTitle,
+
+
-
+
+
+