From eab4f335bae645d5904456d6f186bdf5d8e05e50 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 27 Apr 2017 05:39:58 +0000
Subject: [PATCH] RxFPC:fix localization

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5842 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../Demos/RxDBGrid_Filter/ZEOS/project1.lps   | 41 +++++-------
 .../trunk/Demos/RxDBGrid_Filter/project1.lps  | 62 +++++++++----------
 .../rx/trunk/Demos/RxDBGrid_Filter/unit1.lfm  |  2 +
 components/rx/trunk/languages/rxdconst.ru.po  |  3 +
 .../trunk/rxdb/rxdbgrid_popupfilterunit.pas   |  2 +-
 5 files changed, 50 insertions(+), 60 deletions(-)

diff --git a/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lps b/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lps
index 2aed37d5f..a7887ffa0 100644
--- a/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lps
+++ b/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lps
@@ -3,7 +3,7 @@
   <ProjectSession>
     <Version Value="10"/>
     <BuildModes Active="Default"/>
-    <Units Count="4">
+    <Units Count="5">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -17,9 +17,10 @@
         <Filename Value="unit1.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
-        <TopLine Value="21"/>
+        <TopLine Value="3"/>
         <CursorPos Y="52"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
@@ -27,24 +28,28 @@
       </Unit1>
       <Unit2>
         <Filename Value="../../../rxdb/rxdbgrid.pas"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="3892"/>
-        <CursorPos Y="3800"/>
+        <TopLine Value="995"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
         <UnitName Value="RxDBGrid_PopUpFilterUnit"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
-        <TopLine Value="247"/>
-        <CursorPos X="48" Y="279"/>
+        <TopLine Value="166"/>
+        <CursorPos X="36" Y="177"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit3>
+      <Unit4>
+        <Filename Value="../../../rxdb/rxlookup.pas"/>
+        <EditorIndex Value="-1"/>
+        <UsageCount Value="10"/>
+      </Unit4>
     </Units>
-    <JumpHistory Count="13" HistoryIndex="12">
+    <JumpHistory Count="9" HistoryIndex="8">
       <Position1>
         <Filename Value="unit1.pas"/>
       </Position1>
@@ -74,28 +79,12 @@
       </Position7>
       <Position8>
         <Filename Value="unit1.pas"/>
-        <Caret Line="52" TopLine="21"/>
+        <Caret Line="52" TopLine="3"/>
       </Position8>
       <Position9>
         <Filename Value="../../../rxdb/rxdbgrid.pas"/>
-        <Caret Line="5337" Column="20" TopLine="5316"/>
+        <Caret TopLine="995"/>
       </Position9>
-      <Position10>
-        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
-        <Caret Line="811" Column="15" TopLine="795"/>
-      </Position10>
-      <Position11>
-        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
-        <Caret Line="5339" TopLine="5306"/>
-      </Position11>
-      <Position12>
-        <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="279" Column="48" TopLine="247"/>
-      </Position12>
-      <Position13>
-        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
-        <Caret Line="5341" TopLine="5179"/>
-      </Position13>
     </JumpHistory>
   </ProjectSession>
 </CONFIG>
diff --git a/components/rx/trunk/Demos/RxDBGrid_Filter/project1.lps b/components/rx/trunk/Demos/RxDBGrid_Filter/project1.lps
index cb0e892ab..14e2ffd88 100644
--- a/components/rx/trunk/Demos/RxDBGrid_Filter/project1.lps
+++ b/components/rx/trunk/Demos/RxDBGrid_Filter/project1.lps
@@ -146,102 +146,98 @@
         <UsageCount Value="10"/>
       </Unit15>
     </Units>
-    <JumpHistory Count="24" HistoryIndex="23">
+    <JumpHistory Count="23" HistoryIndex="22">
       <Position1>
         <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="209" Column="3" TopLine="222"/>
+        <Caret Line="180" TopLine="163"/>
       </Position1>
       <Position2>
         <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="180" TopLine="163"/>
+        <Caret Line="166" TopLine="160"/>
       </Position2>
       <Position3>
         <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="166" TopLine="160"/>
+        <Caret Line="168" Column="3" TopLine="160"/>
       </Position3>
       <Position4>
         <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="168" Column="3" TopLine="160"/>
+        <Caret Line="167" TopLine="160"/>
       </Position4>
       <Position5>
         <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="167" TopLine="160"/>
+        <Caret Line="180" TopLine="159"/>
       </Position5>
       <Position6>
-        <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="180" TopLine="159"/>
-      </Position6>
-      <Position7>
         <Filename Value="../../rxdb/rxdbgrid.pas"/>
         <Caret Line="4310" Column="40" TopLine="4296"/>
+      </Position6>
+      <Position7>
+        <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
+        <Caret Line="167" TopLine="160"/>
       </Position7>
       <Position8>
         <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="167" TopLine="160"/>
+        <Caret Line="212" TopLine="193"/>
       </Position8>
       <Position9>
         <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="212" TopLine="193"/>
+        <Caret Line="181" Column="7" TopLine="156"/>
       </Position9>
       <Position10>
         <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="181" Column="7" TopLine="156"/>
+        <Caret Line="81" Column="24" TopLine="66"/>
       </Position10>
       <Position11>
         <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="81" Column="24" TopLine="66"/>
+        <Caret Line="176" Column="30" TopLine="173"/>
       </Position11>
       <Position12>
-        <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
-        <Caret Line="176" Column="30" TopLine="173"/>
+        <Filename Value="../../rxtools/rxdconst.pas"/>
+        <Caret Line="52" Column="3" TopLine="35"/>
       </Position12>
       <Position13>
         <Filename Value="../../rxtools/rxdconst.pas"/>
-        <Caret Line="52" Column="3" TopLine="35"/>
       </Position13>
       <Position14>
         <Filename Value="../../rxtools/rxdconst.pas"/>
+        <Caret Line="99" Column="10" TopLine="69"/>
       </Position14>
       <Position15>
         <Filename Value="../../rxtools/rxdconst.pas"/>
-        <Caret Line="99" Column="10" TopLine="69"/>
+        <Caret Line="100" Column="14" TopLine="70"/>
       </Position15>
       <Position16>
         <Filename Value="../../rxtools/rxdconst.pas"/>
-        <Caret Line="100" Column="14" TopLine="70"/>
+        <Caret Line="116" Column="16" TopLine="86"/>
       </Position16>
       <Position17>
         <Filename Value="../../rxtools/rxdconst.pas"/>
-        <Caret Line="116" Column="16" TopLine="86"/>
+        <Caret Line="136" Column="12" TopLine="106"/>
       </Position17>
       <Position18>
         <Filename Value="../../rxtools/rxdconst.pas"/>
-        <Caret Line="136" Column="12" TopLine="106"/>
+        <Caret Line="138" Column="35" TopLine="107"/>
       </Position18>
       <Position19>
         <Filename Value="../../rxtools/rxdconst.pas"/>
-        <Caret Line="138" Column="35" TopLine="107"/>
+        <Caret Line="145" Column="10" TopLine="110"/>
       </Position19>
       <Position20>
-        <Filename Value="../../rxtools/rxdconst.pas"/>
-        <Caret Line="145" Column="10" TopLine="110"/>
-      </Position20>
-      <Position21>
         <Filename Value="../../rxdb/rxdbgrid_popupfilterunit.pas"/>
         <Caret Line="183" Column="6" TopLine="173"/>
-      </Position21>
-      <Position22>
+      </Position20>
+      <Position21>
         <Filename Value="../../rxtools/rxdconst.pas"/>
         <Caret Line="139" Column="68" TopLine="125"/>
+      </Position21>
+      <Position22>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="52" Column="16" TopLine="26"/>
       </Position22>
       <Position23>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="52" Column="16" TopLine="26"/>
-      </Position23>
-      <Position24>
         <Filename Value="unit1.pas"/>
         <Caret Line="51" Column="16" TopLine="25"/>
-      </Position24>
+      </Position23>
     </JumpHistory>
   </ProjectSession>
 </CONFIG>
diff --git a/components/rx/trunk/Demos/RxDBGrid_Filter/unit1.lfm b/components/rx/trunk/Demos/RxDBGrid_Filter/unit1.lfm
index 1527d0576..7eec944a4 100644
--- a/components/rx/trunk/Demos/RxDBGrid_Filter/unit1.lfm
+++ b/components/rx/trunk/Demos/RxDBGrid_Filter/unit1.lfm
@@ -73,6 +73,7 @@ object Form1: TForm1
         Filter.AllValue = '(All values)'
         Filter.EmptyFont.Style = [fsItalic]
         Filter.ItemIndex = -1
+        Filter.Style = rxfstDialog
         Footers = <>
       end    
       item
@@ -86,6 +87,7 @@ object Form1: TForm1
         Filter.AllValue = '(All values)'
         Filter.EmptyFont.Style = [fsItalic]
         Filter.ItemIndex = -1
+        Filter.Style = rxfstDialog
         Footers = <>
       end>
     KeyStrokes = <    
diff --git a/components/rx/trunk/languages/rxdconst.ru.po b/components/rx/trunk/languages/rxdconst.ru.po
index ef885c505..f23565a3f 100644
--- a/components/rx/trunk/languages/rxdconst.ru.po
+++ b/components/rx/trunk/languages/rxdconst.ru.po
@@ -52,6 +52,7 @@ msgid "Circular data link"
 msgstr "Перекрёстная ссылка данных"
 
 #: rxdconst.sclearfilter
+msgctxt "rxdconst.sclearfilter"
 msgid "Clear filter"
 msgstr "Очистить фильтр"
 
@@ -100,6 +101,7 @@ msgid "Delete record?"
 msgstr "Удалить запись"
 
 #: rxdconst.sdescending
+msgctxt "rxdconst.sdescending"
 msgid "Descending"
 msgstr "По убыванию"
 
@@ -741,3 +743,4 @@ msgstr "Использовать сырой JPEG"
 #: rxdconst.susernamelabel
 msgid "&User name:"
 msgstr "&Имя пользователя"
+
diff --git a/components/rx/trunk/rxdb/rxdbgrid_popupfilterunit.pas b/components/rx/trunk/rxdb/rxdbgrid_popupfilterunit.pas
index 1a073c91d..b65d4c94f 100644
--- a/components/rx/trunk/rxdb/rxdbgrid_popupfilterunit.pas
+++ b/components/rx/trunk/rxdb/rxdbgrid_popupfilterunit.pas
@@ -174,7 +174,7 @@ procedure TRxDBGrid_PopUpFilterForm.Localize;
 begin
   DividerBevel1.Caption:=sSorting;
   SpeedButton1.Caption:=sAscending;
-  SpeedButton2.Caption:=sAscending;
+  SpeedButton2.Caption:=sDescending;
   DividerBevel2.Caption:=sQuickFilter;
   SpeedButton3.Caption:=sClearFilter;
   SpeedButton4.Caption:=sEmptyValues;