diff --git a/components/rx/trunk/languages/rxdconst.es.po b/components/rx/trunk/languages/rxdconst.es.po index 0c5779cc1..24b967130 100644 --- a/components/rx/trunk/languages/rxdconst.es.po +++ b/components/rx/trunk/languages/rxdconst.es.po @@ -74,6 +74,8 @@ msgid "Field '%s' not used in filter expression" msgstr "Campo '%s' no usado en expresión de filtro" #: rxdconst.sexprbadnulltest +#, fuzzy +#| msgid "NULL-values enabled in '=' и '<>'" msgid "NULL-values enabled in '=' и '<>'" msgstr "Valor nulo habilitado en '=' y '<>'" diff --git a/components/rx/trunk/languages/rxdconst.ru.po b/components/rx/trunk/languages/rxdconst.ru.po index 635c4f377..5e5b697a8 100644 --- a/components/rx/trunk/languages/rxdconst.ru.po +++ b/components/rx/trunk/languages/rxdconst.ru.po @@ -74,6 +74,8 @@ msgid "Field '%s' not used in filter expression" msgstr "Поле '%s' не может быть использовано в выражении фильтрации" #: rxdconst.sexprbadnulltest +#, fuzzy +#| msgid "NULL-values enabled in '=' и '<>'" msgid "NULL-values enabled in '=' и '<>'" msgstr "NULL-значения разрешены только в выражениях '=' и '<>'" diff --git a/components/rx/trunk/languages/rxdconst.uk.po b/components/rx/trunk/languages/rxdconst.uk.po index 7857bbe2f..4fde60bdb 100644 --- a/components/rx/trunk/languages/rxdconst.uk.po +++ b/components/rx/trunk/languages/rxdconst.uk.po @@ -83,6 +83,8 @@ msgid "Field '%s' not used in filter expression" msgstr "Поле '%s' не може бути використане в виразі фільтрації" #: rxdconst.sexprbadnulltest +#, fuzzy +#| msgid "NULL-values enabled in '=' и '<>'" msgid "NULL-values enabled in '=' и '<>'" msgstr "NULL-значення дозволені тільки у виразах '=' і '<>'" diff --git a/components/rx/trunk/rxdbgrid.pas b/components/rx/trunk/rxdbgrid.pas index 3894b81cb..ceeb63698 100644 --- a/components/rx/trunk/rxdbgrid.pas +++ b/components/rx/trunk/rxdbgrid.pas @@ -2579,7 +2579,7 @@ var begin if (FSortColumns.Count = 0) then exit; FSortingNow:=true; - if FSortColumns.Count>1 then + if (FSortColumns.Count>1) or (Pos(';', FSortColumns[0].GetSortFields)>0) then begin SetLength(Asc, FSortColumns.Count); for i := 0 to FSortColumns.Count - 1 do