Merge branch 'hotfix/v4.2.9'

This commit is contained in:
Alexey Golubev 2017-02-13 19:22:36 +03:00
commit 5f3342c53e
3 changed files with 6 additions and 1 deletions

View file

@ -582,7 +582,8 @@ define([
data : [
{ value: 'en', displayValue: this.txtEn, exampleValue: this.txtExampleEn },
{ value: 'de', displayValue: this.txtDe, exampleValue: this.txtExampleDe },
{ value: 'ru', displayValue: this.txtRu, exampleValue: this.txtExampleRu }
{ value: 'ru', displayValue: this.txtRu, exampleValue: this.txtExampleRu },
{ value: 'pl', displayValue: this.txtPl, exampleValue: this.txtExamplePl }
]
}).on('selected', _.bind(function(combo, record) {
this.updateFuncExample(record.exampleValue);
@ -781,9 +782,11 @@ define([
txtEn: 'English',
txtDe: 'Deutsch',
txtRu: 'Russian',
txtPl: 'Polish',
txtExampleEn: ' SUM; MIN; MAX; COUNT',
txtExampleDe: ' SUMME; MIN; MAX; ANZAHL',
txtExampleRu: ' СУММ; МИН; МАКС; СЧЁТ',
txtExamplePl: ' SUMA; MIN; MAX; ILE.LICZB',
strFuncLocale: 'Formula Language',
strFuncLocaleEx: 'Example: SUM; MIN; MAX; COUNT',
strRegSettings: 'Regional Settings',

View file

@ -1008,6 +1008,7 @@
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "as OS X",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNative": "Native",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Point",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPl": "Polish",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian",
"SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows",
"SSE.Views.FileMenuPanels.Settings.txtGeneral": "General",

File diff suppressed because one or more lines are too long