mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-09 11:08:00 +02:00
Merged revision(s) 51009 #fc5f053bc6, 51015 #1dc657f13d from trunk:
TAChart: Check validity of base of logarithmic transform (issue #29242) ........ TAChart: updated Russian translation ........ git-svn-id: branches/fixes_1_6@51016 -
This commit is contained in:
parent
0136f6c7bb
commit
ad194c5521
@ -105,6 +105,10 @@ msgstr "Distanzmessung"
|
||||
msgid "Function series"
|
||||
msgstr "Funktions-Diagramm"
|
||||
|
||||
#: tachartstrconsts.rsinvalidlogbase
|
||||
msgid "Logarithm base must be > 0 and <> 1."
|
||||
msgstr "Die Logarithmus-Basis muss größer als 0 und darf nicht gleich 1 sein."
|
||||
|
||||
#: tachartstrconsts.rsleastsquaresfitseries
|
||||
msgid "Least-squares fit series"
|
||||
msgstr "Fit"
|
||||
|
@ -93,6 +93,10 @@ msgstr "Etäisyysmittaus"
|
||||
msgid "Function series"
|
||||
msgstr "Funktiokuvaaja"
|
||||
|
||||
#: tachartstrconsts.rsinvalidlogbase
|
||||
msgid "Logarithm base must be > 0 and <> 1."
|
||||
msgstr ""
|
||||
|
||||
#: tachartstrconsts.rsleastsquaresfitseries
|
||||
msgid "Least-squares fit series"
|
||||
msgstr "Pienimpään neliösummaan sopiva kuvaaja"
|
||||
|
@ -103,6 +103,10 @@ msgstr "Mesure des distances"
|
||||
msgid "Function series"
|
||||
msgstr "Séries de fonctions"
|
||||
|
||||
#: tachartstrconsts.rsinvalidlogbase
|
||||
msgid "Logarithm base must be > 0 and <> 1."
|
||||
msgstr ""
|
||||
|
||||
#: tachartstrconsts.rsleastsquaresfitseries
|
||||
msgid "Least-squares fit series"
|
||||
msgstr "Séries de moindres carrés ajustés"
|
||||
|
@ -93,6 +93,10 @@ msgstr ""
|
||||
msgid "Function series"
|
||||
msgstr ""
|
||||
|
||||
#: tachartstrconsts.rsinvalidlogbase
|
||||
msgid "Logarithm base must be > 0 and <> 1."
|
||||
msgstr ""
|
||||
|
||||
#: tachartstrconsts.rsleastsquaresfitseries
|
||||
msgid "Least-squares fit series"
|
||||
msgstr ""
|
||||
|
@ -103,6 +103,10 @@ msgstr "Измерение расстояния"
|
||||
msgid "Function series"
|
||||
msgstr "Диаграмма по функции"
|
||||
|
||||
#: tachartstrconsts.rsinvalidlogbase
|
||||
msgid "Logarithm base must be > 0 and <> 1."
|
||||
msgstr "Основание логарифма должно быть больше нуля и не равно единице."
|
||||
|
||||
#: tachartstrconsts.rsleastsquaresfitseries
|
||||
msgid "Least-squares fit series"
|
||||
msgstr "Диаграмма по методу наименьших квадратов"
|
||||
@ -200,4 +204,3 @@ msgstr "Невозможно переименовать компоненты: %s
|
||||
#: tachartstrconsts.tastoolseditortitle
|
||||
msgid "Edit tools"
|
||||
msgstr "Редактор средств диаграмм"
|
||||
|
||||
|
@ -106,6 +106,10 @@ msgstr "Avståndsmätning"
|
||||
msgid "Function series"
|
||||
msgstr "Funktionskurva"
|
||||
|
||||
#: tachartstrconsts.rsinvalidlogbase
|
||||
msgid "Logarithm base must be > 0 and <> 1."
|
||||
msgstr ""
|
||||
|
||||
#: tachartstrconsts.rsleastsquaresfitseries
|
||||
msgid "Least-squares fit series"
|
||||
msgstr "Least-squares fit kurva"
|
||||
|
@ -64,6 +64,7 @@ resourcestring
|
||||
rsLinear = 'Linear';
|
||||
rsLogarithmic = 'Logarithmic';
|
||||
rsUserDefined = 'User-defined';
|
||||
rsInvalidLogBase = 'Logarithm base must be > 0 and <> 1.';
|
||||
|
||||
// ChartUtils
|
||||
tasFailedSubcomponentRename = 'Failed to rename components: %s';
|
||||
|
@ -656,6 +656,8 @@ end;
|
||||
procedure TLogarithmAxisTransform.SetBase(AValue: Double);
|
||||
begin
|
||||
if FBase = AValue then exit;
|
||||
if (AValue <= 0) or (AValue = 1.0) then
|
||||
raise Exception.Create(rsInvalidLogBase);
|
||||
FBase := AValue;
|
||||
Changed;
|
||||
end;
|
||||
|
Loading…
Reference in New Issue
Block a user