diff --git a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js
index 2322c7cfe..4515cb475 100644
--- a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js
@@ -214,7 +214,7 @@ define([
if (group.get('functions').length) {
groupsListItems.push({
value : group.get('index'),
- displayValue : this['sCategory' + group.get('name')] || group.get('name')
+ displayValue : group.get('caption')
});
}
}
@@ -380,19 +380,6 @@ define([
cancelButtonText: 'Cancel',
okButtonText: 'Ok',
- sCategoryAll: 'All',
- sCategoryLast10: '10 last used',
- sCategoryLogical: 'Logical',
- sCategoryCube: 'Cube',
- sCategoryDatabase: 'Database',
- sCategoryDateAndTime: 'Date and time',
- sCategoryEngineering: 'Engineering',
- sCategoryFinancial: 'Financial',
- sCategoryInformation: 'Information',
- sCategoryLookupAndReference: 'Lookup and reference',
- sCategoryMathematic: 'Math and trigonometry',
- sCategoryStatistical: 'Statistical',
- sCategoryTextAndData: 'Text and data',
textGroupDescription: 'Select Function Group',
textListDescription: 'Select Function',
sDescription: 'Description',
diff --git a/apps/spreadsheeteditor/main/app/view/FormulaTab.js b/apps/spreadsheeteditor/main/app/view/FormulaTab.js
new file mode 100644
index 000000000..16a3a9189
--- /dev/null
+++ b/apps/spreadsheeteditor/main/app/view/FormulaTab.js
@@ -0,0 +1,265 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+/**
+ * FormulaTab.js
+ *
+ * Created by Julia Radzhabova on 14.06.2019
+ * Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+ 'common/main/lib/util/utils',
+ 'common/main/lib/component/BaseView',
+ 'common/main/lib/component/Layout'
+], function () {
+ 'use strict';
+
+ SSE.Views.FormulaTab = Common.UI.BaseView.extend(_.extend((function(){
+ function setEvents() {
+ var me = this;
+ var _setevent = function(btn){
+ (typeof btn.menu == 'object') && btn.menu.on('item:click', function (menu, item, e) {
+ me.fireEvent('function:apply', [{name: item.caption, origin: item.value}]);
+ });
+ };
+ // me.btnFinancial.menu.on('item:click', function (menu, item, e) {
+ // me.fireEvent('function:apply', [{name: item.caption, origin: item.value}]);
+ // });
+ _setevent(this.btnFinancial);
+ _setevent(this.btnLogical);
+ _setevent(this.btnTextData);
+ _setevent(this.btnDateTime);
+ _setevent(this.btnReference);
+ _setevent(this.btnMath);
+ }
+
+ return {
+ options: {},
+
+ initialize: function (options) {
+ Common.UI.BaseView.prototype.initialize.call(this);
+ this.toolbar = options.toolbar;
+ this.formulasGroups = options.formulasGroups;
+
+ this.lockedControls = [];
+
+ var me = this,
+ $host = me.toolbar.$el,
+ _set = SSE.enumLock;
+
+ var formulaDialog = SSE.getController('FormulaDialog');
+
+ this.btnFinancial = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'btn-cell-group',
+ caption: formulaDialog.sCategoryFinancial,
+ hint: formulaDialog.sCategoryFinancial,
+ menu: true,
+ split: false,
+ disabled: true,
+ lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
+ });
+ Common.Utils.injectComponent($host.find('#slot-btn-financial'), this.btnFinancial);
+ this.lockedControls.push(this.btnFinancial);
+
+ this.btnLogical = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'btn-cell-group',
+ caption: formulaDialog.sCategoryLogical,
+ hint: formulaDialog.sCategoryLogical,
+ menu: true,
+ split: false,
+ disabled: true,
+ lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
+ });
+ Common.Utils.injectComponent($host.find('#slot-btn-logical'), this.btnLogical);
+ this.lockedControls.push(this.btnLogical);
+
+ this.btnTextData = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'btn-cell-group',
+ caption: formulaDialog.sCategoryTextAndData,
+ hint: formulaDialog.sCategoryTextAndData,
+ menu: true,
+ split: false,
+ disabled: true,
+ lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
+ });
+ Common.Utils.injectComponent($host.find('#slot-btn-text'), this.btnTextData);
+ this.lockedControls.push(this.btnTextData);
+
+ this.btnDateTime = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'btn-cell-group',
+ caption: formulaDialog.sCategoryDateAndTime,
+ hint: formulaDialog.sCategoryDateAndTime,
+ menu: true,
+ split: false,
+ disabled: true,
+ lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
+ });
+ Common.Utils.injectComponent($host.find('#slot-btn-datetime'), this.btnDateTime);
+ this.lockedControls.push(this.btnDateTime);
+
+ this.btnReference = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'btn-cell-group',
+ caption: formulaDialog.sCategoryLookupAndReference,
+ hint: formulaDialog.sCategoryLookupAndReference,
+ menu: true,
+ split: false,
+ disabled: true,
+ lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
+ });
+ Common.Utils.injectComponent($host.find('#slot-btn-lookup'), this.btnReference);
+ this.lockedControls.push(this.btnReference);
+
+ this.btnMath = new Common.UI.Button({
+ cls: 'btn-toolbar x-huge icon-top',
+ iconCls: 'btn-cell-group',
+ caption: formulaDialog.sCategoryMathematic,
+ hint: formulaDialog.sCategoryMathematic,
+ menu: true,
+ split: false,
+ disabled: true,
+ lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
+ });
+ Common.Utils.injectComponent($host.find('#slot-btn-math'), this.btnMath);
+ this.lockedControls.push(this.btnMath);
+
+ Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
+ },
+
+ render: function (el) {
+ return this;
+ },
+
+ onAppReady: function (config) {
+ var me = this;
+ (new Promise(function (accept, reject) {
+ accept();
+ })).then(function(){
+ // setEvents.call(me);
+ });
+ },
+
+ show: function () {
+ Common.UI.BaseView.prototype.show.call(this);
+ this.fireEvent('show', this);
+ },
+
+ getButtons: function(type) {
+ return this.lockedControls;
+ },
+
+ SetDisabled: function (state) {
+ this.lockedControls && this.lockedControls.forEach(function(button) {
+ if ( button ) {
+ button.setDisabled(state);
+ }
+ }, this);
+ },
+
+ fillFunctions: function () {
+ if (this.formulasGroups) {
+ var me = this;
+ var setMenu = function(btn, name) {
+ var i = 0,
+ length = 0,
+ functions = null,
+ arr = [],
+ group = me.formulasGroups.findWhere({name : name});
+
+ if (group) {
+ functions = group.get('functions');
+ functions && functions.forEach(function(item) {
+ arr.push(new Common.UI.MenuItem({
+ caption: item.get('name'),
+ value: item.get('origin')
+ }));
+ });
+ }
+ if (arr.length) {
+ if (btn.menu && btn.menu.rendered) {
+ btn.menu.removeAll();
+ arr.forEach(function(item){
+ btn.menu.addItem(item);
+ });
+ } else {
+ btn.setMenu(new Common.UI.Menu({
+ maxHeight: 400,
+ items: arr
+ }).on('show:before', function (mnu) {
+ if (!this.scroller) {
+ this.scroller = new Common.UI.Scroller({
+ el: $(this.el).find('.dropdown-menu '),
+ useKeyboard: this.enableKeyEvents && !this.handleSelect,
+ minScrollbarLength: 30,
+ alwaysVisibleY: true
+ });
+ }
+ }).on('show:after', function (mnu) {
+ this.scroller && this.scroller.update({alwaysVisibleY: true});
+ }));
+ btn.menu.on('item:click', function (menu, item, e) {
+ me.fireEvent('function:apply', [{name: item.caption, origin: item.value}]);
+ });
+ }
+ }
+ btn.setDisabled(arr.length<1);
+ };
+
+ setMenu(this.btnFinancial, 'Financial');
+ setMenu(this.btnLogical, 'Logical');
+ setMenu(this.btnTextData, 'TextAndData');
+ setMenu(this.btnDateTime, 'DateAndTime');
+ setMenu(this.btnReference, 'LookupAndReference');
+ setMenu(this.btnMath, 'Mathematic');
+ }
+ },
+
+ capBtnGroup: 'Group',
+ capBtnUngroup: 'Ungroup',
+ textRows: 'Ungroup rows',
+ textColumns: 'Ungroup columns',
+ textClear: 'Clear outline',
+ tipGroup: 'Group range of cells',
+ tipUngroup: 'Ungroup range of cells',
+ capBtnTextToCol: 'Text to Columns',
+ tipToColumns: 'Separate cell text into columns',
+ capBtnTextShow: 'Show details',
+ capBtnTextHide: 'Hide details'
+ }
+ }()), SSE.Views.FormulaTab || {}));
+});
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index a2bb10e46..b74ad4991 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -313,6 +313,7 @@ define([
{ caption: me.textTabHome, action: 'home', extcls: 'canedit'},
{ caption: me.textTabInsert, action: 'ins', extcls: 'canedit'},
{caption: me.textTabLayout, action: 'layout', extcls: 'canedit'},
+ {caption: me.textTabFormula, action: 'formula', extcls: 'canedit'},
{caption: me.textTabData, action: 'data', extcls: 'canedit'}
]}
);
@@ -2362,6 +2363,7 @@ define([
tipEditHeader: 'Edit header or footer',
textTabData: 'Data',
capInsertTable: 'Table',
- tipInsertTable: 'Insert table'
+ tipInsertTable: 'Insert table',
+ textTabFormula: 'Formula'
}, SSE.Views.Toolbar || {}));
});
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json
index 2427a913c..4d15b4bd5 100644
--- a/apps/spreadsheeteditor/main/locale/de.json
+++ b/apps/spreadsheeteditor/main/locale/de.json
@@ -369,6 +369,19 @@
"SSE.Controllers.DocumentHolder.txtUndoExpansion": "Automatische Erweiterung der Tabelle rückgängig machen",
"SSE.Controllers.DocumentHolder.txtUseTextImport": "Text Import-Assistenten verwenden",
"SSE.Controllers.DocumentHolder.txtWidth": "Breite",
+ "SSE.Controllers.FormulaDialog.sCategoryAll": "Alle",
+ "SSE.Controllers.FormulaDialog.sCategoryLast10": "10 zuletzt verwendete",
+ "SSE.Controllers.FormulaDialog.sCategoryCube": "Cube",
+ "SSE.Controllers.FormulaDialog.sCategoryDatabase": "Datenbank",
+ "SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Datum und Uhrzeit",
+ "SSE.Controllers.FormulaDialog.sCategoryEngineering": "Konstruktion",
+ "SSE.Controllers.FormulaDialog.sCategoryFinancial": "Finanzmathematik",
+ "SSE.Controllers.FormulaDialog.sCategoryInformation": "Information",
+ "SSE.Controllers.FormulaDialog.sCategoryLogical": "Logisch",
+ "SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Suchen und Bezüge",
+ "SSE.Controllers.FormulaDialog.sCategoryMathematic": "Mathematik und Trigonometrie",
+ "SSE.Controllers.FormulaDialog.sCategoryStatistical": "Statistik",
+ "SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Text und Daten",
"SSE.Controllers.LeftMenu.newDocumentTitle": "Unbetitelte Kalkulationstabelle",
"SSE.Controllers.LeftMenu.textByColumns": "Spaltenweise",
"SSE.Controllers.LeftMenu.textByRows": "Zeilenweise",
@@ -1581,19 +1594,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Funktionsgruppe auswählen",
"SSE.Views.FormulaDialog.textListDescription": "Funktion auswählen",
"SSE.Views.FormulaDialog.txtTitle": "Funktion einfügen",
- "SSE.Views.FormulaDialog.sCategoryAll": "Alle",
- "SSE.Views.FormulaDialog.sCategoryLast10": "10 zuletzt verwendete",
- "SSE.Views.FormulaDialog.sCategoryCube": "Cube",
- "SSE.Views.FormulaDialog.sCategoryDatabase": "Datenbank",
- "SSE.Views.FormulaDialog.sCategoryDateAndTime": "Datum und Uhrzeit",
- "SSE.Views.FormulaDialog.sCategoryEngineering": "Konstruktion",
- "SSE.Views.FormulaDialog.sCategoryFinancial": "Finanzmathematik",
- "SSE.Views.FormulaDialog.sCategoryInformation": "Information",
- "SSE.Views.FormulaDialog.sCategoryLogical": "Logisch",
- "SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Suchen und Bezüge",
- "SSE.Views.FormulaDialog.sCategoryMathematic": "Mathematik und Trigonometrie",
- "SSE.Views.FormulaDialog.sCategoryStatistical": "Statistik",
- "SSE.Views.FormulaDialog.sCategoryTextAndData": "Text und Daten",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Abbrechen",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Anzeigen",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Verknüpfen mit",
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index dbdbcc4ee..c077fde15 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -371,6 +371,19 @@
"SSE.Controllers.DocumentHolder.txtUndoExpansion": "Undo table autoexpansion",
"SSE.Controllers.DocumentHolder.txtUseTextImport": "Use text import wizard",
"SSE.Controllers.DocumentHolder.txtWidth": "Width",
+ "SSE.Controllers.FormulaDialog.sCategoryAll": "All",
+ "SSE.Controllers.FormulaDialog.sCategoryLast10": "10 last used",
+ "SSE.Controllers.FormulaDialog.sCategoryLogical": "Logical",
+ "SSE.Controllers.FormulaDialog.sCategoryCube": "Cube",
+ "SSE.Controllers.FormulaDialog.sCategoryDatabase": "Database",
+ "SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Date and time",
+ "SSE.Controllers.FormulaDialog.sCategoryEngineering": "Engineering",
+ "SSE.Controllers.FormulaDialog.sCategoryFinancial": "Financial",
+ "SSE.Controllers.FormulaDialog.sCategoryInformation": "Information",
+ "SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Lookup and reference",
+ "SSE.Controllers.FormulaDialog.sCategoryMathematic": "Math and trigonometry",
+ "SSE.Controllers.FormulaDialog.sCategoryStatistical": "Statistical",
+ "SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Text and data",
"SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet",
"SSE.Controllers.LeftMenu.textByColumns": "By columns",
"SSE.Controllers.LeftMenu.textByRows": "By rows",
@@ -1594,19 +1607,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Select Function Group",
"SSE.Views.FormulaDialog.textListDescription": "Select Function",
"SSE.Views.FormulaDialog.txtTitle": "Insert Function",
- "SSE.Views.FormulaDialog.sCategoryAll": "All",
- "SSE.Views.FormulaDialog.sCategoryLast10": "10 last used",
- "SSE.Views.FormulaDialog.sCategoryLogical": "Logical",
- "SSE.Views.FormulaDialog.sCategoryCube": "Cube",
- "SSE.Views.FormulaDialog.sCategoryDatabase": "Database",
- "SSE.Views.FormulaDialog.sCategoryDateAndTime": "Date and time",
- "SSE.Views.FormulaDialog.sCategoryEngineering": "Engineering",
- "SSE.Views.FormulaDialog.sCategoryFinancial": "Financial",
- "SSE.Views.FormulaDialog.sCategoryInformation": "Information",
- "SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Lookup and reference",
- "SSE.Views.FormulaDialog.sCategoryMathematic": "Math and trigonometry",
- "SSE.Views.FormulaDialog.sCategoryStatistical": "Statistical",
- "SSE.Views.FormulaDialog.sCategoryTextAndData": "Text and data",
"SSE.Views.GroupDialog.cancelButtonText": "Cancel",
"SSE.Views.GroupDialog.okButtonText": "Ok",
"SSE.Views.GroupDialog.textRows": "Rows",
@@ -2368,6 +2368,7 @@
"SSE.Views.Toolbar.capBtnInsHeader": "Header/Footer",
"SSE.Views.Toolbar.tipEditHeader": "Edit header or footer",
"SSE.Views.Toolbar.textTabData": "Data",
+ "SSE.Views.Toolbar.textTabFormula": "Formula",
"SSE.Views.Top10FilterDialog.cancelButtonText": "Cancel",
"SSE.Views.Top10FilterDialog.okButtonText": "OK",
"SSE.Views.Top10FilterDialog.textType": "Show",
diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json
index 24c3878ee..36f8ef606 100644
--- a/apps/spreadsheeteditor/main/locale/es.json
+++ b/apps/spreadsheeteditor/main/locale/es.json
@@ -369,6 +369,19 @@
"SSE.Controllers.DocumentHolder.txtUndoExpansion": "Deshacer la expansión automática de la tabla",
"SSE.Controllers.DocumentHolder.txtUseTextImport": "Usar el Asistente para importar texto",
"SSE.Controllers.DocumentHolder.txtWidth": "Ancho",
+ "SSE.Controllers.FormulaDialog.sCategoryAll": "Todo",
+ "SSE.Controllers.FormulaDialog.sCategoryLast10": "10 últimas utilizadas",
+ "SSE.Controllers.FormulaDialog.sCategoryLogical": "Lógico",
+ "SSE.Controllers.FormulaDialog.sCategoryCube": "Cubo",
+ "SSE.Controllers.FormulaDialog.sCategoryDatabase": "Base de Datos",
+ "SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Fecha y hora",
+ "SSE.Controllers.FormulaDialog.sCategoryEngineering": "Ingenería",
+ "SSE.Controllers.FormulaDialog.sCategoryFinancial": "Financial",
+ "SSE.Controllers.FormulaDialog.sCategoryInformation": "Información",
+ "SSE.Controllers.FormulaDialog.sCategoryLookupAndReferences": "Búsqueda y referencia",
+ "SSE.Controllers.FormulaDialog.sCategoryMathematic": "Matemáticas y trigonometría",
+ "SSE.Controllers.FormulaDialog.sCategoryStatistical": "Estadístico",
+ "SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Texto y datos",
"SSE.Controllers.LeftMenu.newDocumentTitle": "Hoja de cálculo sin nombre",
"SSE.Controllers.LeftMenu.textByColumns": "Columnas",
"SSE.Controllers.LeftMenu.textByRows": "Filas",
@@ -1581,19 +1594,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Seleccionar grupo de función",
"SSE.Views.FormulaDialog.textListDescription": "Seleccionar función",
"SSE.Views.FormulaDialog.txtTitle": "Insertar función",
- "SSE.Views.FormulaDialog.sCategoryAll": "Todo",
- "SSE.Views.FormulaDialog.sCategoryLast10": "10 últimas utilizadas",
- "SSE.Views.FormulaDialog.sCategoryLogical": "Lógico",
- "SSE.Views.FormulaDialog.sCategoryCube": "Cubo",
- "SSE.Views.FormulaDialog.sCategoryDatabase": "Base de Datos",
- "SSE.Views.FormulaDialog.sCategoryDateAndTime": "Fecha y hora",
- "SSE.Views.FormulaDialog.sCategoryEngineering": "Ingenería",
- "SSE.Views.FormulaDialog.sCategoryFinancial": "Financial",
- "SSE.Views.FormulaDialog.sCategoryInformation": "Información",
- "SSE.Views.FormulaDialog.sCategoryLookupAndReferences": "Búsqueda y referencia",
- "SSE.Views.FormulaDialog.sCategoryMathematic": "Matemáticas y trigonometría",
- "SSE.Views.FormulaDialog.sCategoryStatistical": "Estadístico",
- "SSE.Views.FormulaDialog.sCategoryTextAndData": "Texto y datos",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Cancelar",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Mostrar",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Enlace a",
diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json
index 4d8046907..fce8d994f 100644
--- a/apps/spreadsheeteditor/main/locale/fr.json
+++ b/apps/spreadsheeteditor/main/locale/fr.json
@@ -223,6 +223,19 @@
"Common.Views.SignSettingsDialog.textShowDate": "Afficher la date de signature à côté de la signature",
"Common.Views.SignSettingsDialog.textTitle": "Mise en place de la signature",
"Common.Views.SignSettingsDialog.txtEmpty": "Ce champ est obligatoire",
+ "SSE.Controllers.FormulaDialog.sCategoryAll": "Tout",
+ "SSE.Controllers.FormulaDialog.sCategoryLast10": "10 dernières utilisées",
+ "SSE.Controllers.FormulaDialog.sCategoryLogical": "Logique",
+ "SSE.Controllers.FormulaDialog.sCategoryCube": "Cube",
+ "SSE.Controllers.FormulaDialog.sCategoryDatabase": "Base de données",
+ "SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Date et heure",
+ "SSE.Controllers.FormulaDialog.sCategoryEngineering": "Ingénierie",
+ "SSE.Controllers.FormulaDialog.sCategoryFinancial": "Financier",
+ "SSE.Controllers.FormulaDialog.sCategoryInformation": "Information",
+ "SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Recherche et référence",
+ "SSE.Controllers.FormulaDialog.sCategoryMathematic": "Maths et trigonométrie",
+ "SSE.Controllers.FormulaDialog.sCategoryStatistical": "Statistiques",
+ "SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Texte et données",
"SSE.Controllers.DocumentHolder.alignmentText": "Alignement",
"SSE.Controllers.DocumentHolder.centerText": "Au centre",
"SSE.Controllers.DocumentHolder.deleteColumnText": "Supprimer la colonne",
@@ -1582,19 +1595,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Sélectionner un groupe de fonctions",
"SSE.Views.FormulaDialog.textListDescription": "Sélectionner une fonction",
"SSE.Views.FormulaDialog.txtTitle": "Insérer une fonction",
- "SSE.Views.FormulaDialog.sCategoryAll": "Tout",
- "SSE.Views.FormulaDialog.sCategoryLast10": "10 dernières utilisées",
- "SSE.Views.FormulaDialog.sCategoryLogical": "Logique",
- "SSE.Views.FormulaDialog.sCategoryCube": "Cube",
- "SSE.Views.FormulaDialog.sCategoryDatabase": "Base de données",
- "SSE.Views.FormulaDialog.sCategoryDateAndTime": "Date et heure",
- "SSE.Views.FormulaDialog.sCategoryEngineering": "Ingénierie",
- "SSE.Views.FormulaDialog.sCategoryFinancial": "Financier",
- "SSE.Views.FormulaDialog.sCategoryInformation": "Information",
- "SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Recherche et référence",
- "SSE.Views.FormulaDialog.sCategoryMathematic": "Maths et trigonométrie",
- "SSE.Views.FormulaDialog.sCategoryStatistical": "Statistiques",
- "SSE.Views.FormulaDialog.sCategoryTextAndData": "Texte et données",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Annuler",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Afficher",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Lier à",
diff --git a/apps/spreadsheeteditor/main/locale/it.json b/apps/spreadsheeteditor/main/locale/it.json
index 750709d77..dbe0f9beb 100644
--- a/apps/spreadsheeteditor/main/locale/it.json
+++ b/apps/spreadsheeteditor/main/locale/it.json
@@ -222,6 +222,19 @@
"Common.Views.SignSettingsDialog.textShowDate": "Mostra la data nella riga di Firma",
"Common.Views.SignSettingsDialog.textTitle": "Impostazioni firma",
"Common.Views.SignSettingsDialog.txtEmpty": "Campo obbligatorio",
+ "SSE.Controllers.FormulaDialog.sCategoryAll": "Tutto",
+ "SSE.Controllers.FormulaDialog.sCategoryLast10": "10 ultime utilizzate",
+ "SSE.Controllers.FormulaDialog.sCategoryLogical": "Logico",
+ "SSE.Controllers.FormulaDialog.sCategoryCube": "Cubo",
+ "SSE.Controllers.FormulaDialog.sCategoryDatabase": "Banca dati",
+ "SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Data e ora",
+ "SSE.Controllers.FormulaDialog.sCategoryEngineering": "Ingegneria",
+ "SSE.Controllers.FormulaDialog.sCategoryFinancial": "Finanziario",
+ "SSE.Controllers.FormulaDialog.sCategoryInformation": "Informazioni",
+ "SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Ricerca e Riferimento",
+ "SSE.Controllers.FormulaDialog.sCategoryMathematic": "Matematiche e trigonometriche",
+ "SSE.Controllers.FormulaDialog.sCategoryStatistical": "Statistico",
+ "SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Testo e dati",
"SSE.Controllers.DocumentHolder.alignmentText": "Allineamento",
"SSE.Controllers.DocumentHolder.centerText": "Al centro",
"SSE.Controllers.DocumentHolder.deleteColumnText": "Elimina colonna",
@@ -1508,19 +1521,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Seleziona gruppo di funzioni",
"SSE.Views.FormulaDialog.textListDescription": "Seleziona funzione",
"SSE.Views.FormulaDialog.txtTitle": "Inserisci funzione",
- "SSE.Views.FormulaDialog.sCategoryAll": "Tutto",
- "SSE.Views.FormulaDialog.sCategoryLast10": "10 ultime utilizzate",
- "SSE.Views.FormulaDialog.sCategoryLogical": "Logico",
- "SSE.Views.FormulaDialog.sCategoryCube": "Cubo",
- "SSE.Views.FormulaDialog.sCategoryDatabase": "Banca dati",
- "SSE.Views.FormulaDialog.sCategoryDateAndTime": "Data e ora",
- "SSE.Views.FormulaDialog.sCategoryEngineering": "Ingegneria",
- "SSE.Views.FormulaDialog.sCategoryFinancial": "Finanziario",
- "SSE.Views.FormulaDialog.sCategoryInformation": "Informazioni",
- "SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Ricerca e Riferimento",
- "SSE.Views.FormulaDialog.sCategoryMathematic": "Matematiche e trigonometriche",
- "SSE.Views.FormulaDialog.sCategoryStatistical": "Statistico",
- "SSE.Views.FormulaDialog.sCategoryTextAndData": "Testo e dati",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Annulla",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Visualizza",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Collega a",
diff --git a/apps/spreadsheeteditor/main/locale/pl.json b/apps/spreadsheeteditor/main/locale/pl.json
index 210b0a7e9..5d6942550 100644
--- a/apps/spreadsheeteditor/main/locale/pl.json
+++ b/apps/spreadsheeteditor/main/locale/pl.json
@@ -111,6 +111,19 @@
"Common.Views.RenameDialog.okButtonText": "OK",
"Common.Views.RenameDialog.textName": "Nazwa pliku",
"Common.Views.RenameDialog.txtInvalidName": "Nazwa pliku nie może zawierać żadnego z następujących znaków:",
+ "SSE.Controllers.FormulaDialog.sCategoryAll": "Wszystko",
+ "SSE.Controllers.FormulaDialog.sCategoryLast10": "10 ostatnio używanych",
+ "SSE.Controllers.FormulaDialog.sCategoryLogical": "Logiczny",
+ "SSE.Controllers.FormulaDialog.sCategoryCube": "Sześcian",
+ "SSE.Controllers.FormulaDialog.sCategoryDatabase": "Baza danych",
+ "SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Data i czas",
+ "SSE.Controllers.FormulaDialog.sCategoryEngineering": "Inżyniera",
+ "SSE.Controllers.FormulaDialog.sCategoryFinancial": "Finansowe",
+ "SSE.Controllers.FormulaDialog.sCategoryInformation": "Informacja",
+ "SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Wyszukiwanie i odniesienie",
+ "SSE.Controllers.FormulaDialog.sCategoryMathematic": "Matematyczne i trygonometryczne",
+ "SSE.Controllers.FormulaDialog.sCategoryStatistical": "Statystyczny",
+ "SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Tekst i data",
"SSE.Controllers.DocumentHolder.alignmentText": "Wyrównanie",
"SSE.Controllers.DocumentHolder.centerText": "Środek",
"SSE.Controllers.DocumentHolder.deleteColumnText": "Usuń kolumnę",
@@ -1165,19 +1178,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Wybierz grupę funkcji",
"SSE.Views.FormulaDialog.textListDescription": "Wybierz funkcję",
"SSE.Views.FormulaDialog.txtTitle": "Wstaw funkcję",
- "SSE.Views.FormulaDialog.sCategoryAll": "Wszystko",
- "SSE.Views.FormulaDialog.sCategoryLast10": "10 ostatnio używanych",
- "SSE.Views.FormulaDialog.sCategoryLogical": "Logiczny",
- "SSE.Views.FormulaDialog.sCategoryCube": "Sześcian",
- "SSE.Views.FormulaDialog.sCategoryDatabase": "Baza danych",
- "SSE.Views.FormulaDialog.sCategoryDateAndTime": "Data i czas",
- "SSE.Views.FormulaDialog.sCategoryEngineering": "Inżyniera",
- "SSE.Views.FormulaDialog.sCategoryFinancial": "Finansowe",
- "SSE.Views.FormulaDialog.sCategoryInformation": "Informacja",
- "SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Wyszukiwanie i odniesienie",
- "SSE.Views.FormulaDialog.sCategoryMathematic": "Matematyczne i trygonometryczne",
- "SSE.Views.FormulaDialog.sCategoryStatistical": "Statystyczny",
- "SSE.Views.FormulaDialog.sCategoryTextAndData": "Tekst i data",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Anuluj",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Pokaż",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Link do",
diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json
index 6107378d6..adc39ba89 100644
--- a/apps/spreadsheeteditor/main/locale/ru.json
+++ b/apps/spreadsheeteditor/main/locale/ru.json
@@ -223,6 +223,19 @@
"Common.Views.SignSettingsDialog.textShowDate": "Показывать дату подписи в строке подписи",
"Common.Views.SignSettingsDialog.textTitle": "Настройка подписи",
"Common.Views.SignSettingsDialog.txtEmpty": "Это поле необходимо заполнить",
+ "SSE.Controllers.FormulaDialog.sCategoryAll": "Все",
+ "SSE.Controllers.FormulaDialog.sCategoryLast10": "10 недавно использовавшихся",
+ "SSE.Controllers.FormulaDialog.sCategoryCube": "Кубические",
+ "SSE.Controllers.FormulaDialog.sCategoryDatabase": "Базы данных",
+ "SSE.Controllers.FormulaDialog.sCategoryDateAndTime": "Дата и время",
+ "SSE.Controllers.FormulaDialog.sCategoryEngineering": "Инженерные",
+ "SSE.Controllers.FormulaDialog.sCategoryFinancial": "Финансовые",
+ "SSE.Controllers.FormulaDialog.sCategoryInformation": "Информационные",
+ "SSE.Controllers.FormulaDialog.sCategoryLogical": "Логические",
+ "SSE.Controllers.FormulaDialog.sCategoryLookupAndReference": "Поиск и ссылки",
+ "SSE.Controllers.FormulaDialog.sCategoryMathematic": "Математические",
+ "SSE.Controllers.FormulaDialog.sCategoryStatistical": "Статистические",
+ "SSE.Controllers.FormulaDialog.sCategoryTextAndData": "Текст и данные",
"SSE.Controllers.DocumentHolder.alignmentText": "Выравнивание",
"SSE.Controllers.DocumentHolder.centerText": "По центру",
"SSE.Controllers.DocumentHolder.deleteColumnText": "Удалить столбец",
@@ -1582,19 +1595,6 @@
"SSE.Views.FormulaDialog.textGroupDescription": "Выберите группу функций",
"SSE.Views.FormulaDialog.textListDescription": "Выберите функцию",
"SSE.Views.FormulaDialog.txtTitle": "Вставить функцию",
- "SSE.Views.FormulaDialog.sCategoryAll": "Все",
- "SSE.Views.FormulaDialog.sCategoryLast10": "10 недавно использовавшихся",
- "SSE.Views.FormulaDialog.sCategoryCube": "Кубические",
- "SSE.Views.FormulaDialog.sCategoryDatabase": "Базы данных",
- "SSE.Views.FormulaDialog.sCategoryDateAndTime": "Дата и время",
- "SSE.Views.FormulaDialog.sCategoryEngineering": "Инженерные",
- "SSE.Views.FormulaDialog.sCategoryFinancial": "Финансовые",
- "SSE.Views.FormulaDialog.sCategoryInformation": "Информационные",
- "SSE.Views.FormulaDialog.sCategoryLogical": "Логические",
- "SSE.Views.FormulaDialog.sCategoryLookupAndReference": "Поиск и ссылки",
- "SSE.Views.FormulaDialog.sCategoryMathematic": "Математические",
- "SSE.Views.FormulaDialog.sCategoryStatistical": "Статистические",
- "SSE.Views.FormulaDialog.sCategoryTextAndData": "Текст и данные",
"SSE.Views.HyperlinkSettingsDialog.cancelButtonText": "Отмена",
"SSE.Views.HyperlinkSettingsDialog.strDisplay": "Отображать",
"SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Связать с",