Merge tag 'v4.2.9' into develop
v4.2.9 v4.2.9
This commit is contained in:
commit
e25fe1c73b
|
@ -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);
|
||||
|
@ -791,9 +792,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',
|
||||
|
|
|
@ -1053,6 +1053,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
Loading…
Reference in a new issue