diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 7f91f97..e77a3ba 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -40,6 +40,12 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">True</Package_Options></Package_Options><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
diff --git a/Source/Base/Base.drc b/Source/Base/Base.drc
index aeca9cb..ba16db1 100644
--- a/Source/Base/Base.drc
+++ b/Source/Base/Base.drc
@@ -15,10 +15,10 @@ BEGIN
 END
 
 /* C:\Varela_D2007\Source\Base\uConfigurarConexion.dfm */
-/* C:\Varela_D2007\Source\Base\uDMBase.dfm */
+/* C:\Varela_D2007\Source\Base\uDMBase.DFM */
 /* C:\Varela_D2007\Source\Base\uViewBase.dfm */
 /* C:\Varela_D2007\Source\Base\uEditorBase.dfm */
-/* C:\Varela_D2007\Source\Base\uDataModuleBase.dfm */
+/* C:\Varela_D2007\Source\Base\uDataModuleBase.DFM */
 /* C:\Varela_D2007\Source\Base\uViewGridBase.dfm */
 /* C:\Varela_D2007\Source\Base\uEditorItem.dfm */
 /* C:\Varela_D2007\Source\Base\uEditorDBBase.dfm */
@@ -29,4 +29,4 @@ END
 /* C:\Varela_D2007\Source\Base\uViewBarraSeleccion.dfm */
 /* C:\Varela_D2007\Source\Base\uViewGrid.dfm */
 /* C:\Varela_D2007\Source\Base\Base.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf32.tmp */
+/* C:\Varela_D2007\Source\Base\Base.drf */
diff --git a/Source/Base/Base.res b/Source/Base/Base.res
index 01cbcba..45dc55f 100644
Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ
diff --git a/Source/CargaEDI/CargaEDI.drc b/Source/CargaEDI/CargaEDI.drc
index 3f93cff..d5333cf 100644
--- a/Source/CargaEDI/CargaEDI.drc
+++ b/Source/CargaEDI/CargaEDI.drc
@@ -12,7 +12,7 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */
+/* c:\archivos de programa\codegear\rad studio\5.0\Lib\WindowsXP.res */
 /* C:\Varela_D2007\Source\CargaEDI\uCargaEDI.dfm */
 /* C:\Varela_D2007\Source\CargaEDI\CargaEDI.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4C.tmp */
+/* C:\Varela_D2007\Source\CargaEDI\CargaEDI.drf */
diff --git a/Source/Cliente/AdminPV.dproj b/Source/Cliente/AdminPV.dproj
index 34611b4..0ec1b85 100644
--- a/Source/Cliente/AdminPV.dproj
+++ b/Source/Cliente/AdminPV.dproj
@@ -42,12 +42,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">5</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 19 de mayo de 2008 16:33</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 16 de octubre de 2008 13:41</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       
       
diff --git a/Source/Cliente/AdminPV.rc b/Source/Cliente/AdminPV.rc
index ee59d11..f2828fe 100644
--- a/Source/Cliente/AdminPV.rc
+++ b/Source/Cliente/AdminPV.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Varela_D2007\Resources\Iconos\Cliente.ico"
 1 VERSIONINFO
-FILEVERSION 2,1,4,0
-PRODUCTVERSION 2,1,4,0
+FILEVERSION 2,1,5,0
+PRODUCTVERSION 2,1,5,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,11 +13,11 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.1.4.0\0"
+              VALUE "FileVersion", "2.1.5.0\0"
               VALUE "InternalName", "Administración de puntos de venta\0"
               VALUE "ProductName", "Administración de puntos de venta\0"
-              VALUE "ProductVersion", "2.1.4.0\0"
-              VALUE "CompileDate", "lunes, 19 de mayo de 2008 16:33\0"
+              VALUE "ProductVersion", "2.1.5.0\0"
+              VALUE "CompileDate", "jueves, 16 de octubre de 2008 13:41\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Cliente/AdminPV.res b/Source/Cliente/AdminPV.res
index 2e3d118..49db5f1 100644
Binary files a/Source/Cliente/AdminPV.res and b/Source/Cliente/AdminPV.res differ
diff --git a/Source/ControlesBase/ControlesBase.drc b/Source/ControlesBase/ControlesBase.drc
index 7619fac..e0cdfd8 100644
--- a/Source/ControlesBase/ControlesBase.drc
+++ b/Source/ControlesBase/ControlesBase.drc
@@ -15,7 +15,7 @@ END
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uFormPropiedadesControl.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewControlesBase.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uEditorControlesBase.dfm */
-/* C:\Varela_D2007\Source\ControlesBase\Cliente\uDataModuleControles.dfm */
+/* C:\Varela_D2007\Source\ControlesBase\Cliente\uDataModuleControles.DFM */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewControlGrid.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewParametrosControlGrid.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewAgrupaciones.dfm */
@@ -26,4 +26,4 @@ END
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uEditorControlBase.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\Cliente\uViewPeriodoFechas.dfm */
 /* C:\Varela_D2007\Source\ControlesBase\ControlesBase.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf34.tmp */
+/* C:\Varela_D2007\Source\ControlesBase\ControlesBase.drf */
diff --git a/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc b/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc
index e218c13..3099efa 100644
--- a/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc
+++ b/Source/Modulos/Devoluciones/Cliente/Devoluciones.drc
@@ -12,10 +12,10 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uDataModuleDevoluciones.dfm */
+/* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uDataModuleDevoluciones.DFM */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uViewListaDevoluciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uEditorListaDevoluciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uPluginControllerDevoluciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\uEditorAjustarDevoluciones.dfm */
 /* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\Devoluciones.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf44.tmp */
+/* C:\Varela_D2007\Source\Modulos\Devoluciones\Cliente\Devoluciones.drf */
diff --git a/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm b/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm
index 4936969..2bf69c9 100644
--- a/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm
+++ b/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm
@@ -23,7 +23,7 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
           Column = cxGridViewDIFERENCIA
         end
         item
-          Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades'
+          Format = ',0;-,0'
           Kind = skSum
           Column = cxGridViewDIFERENCIA
         end>
diff --git a/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas b/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas
index 62db231..c2d61aa 100644
--- a/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas
+++ b/Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas
@@ -634,7 +634,7 @@ var
 begin
   inherited;
 
-  Val1 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
+  Val1 := AText + ' ' + Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
   Val2 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewCOLOR.Index];
   AText := 'Producto: ' + Val1 + ' - Color: ' + Val2;
 end;
diff --git a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc
index 185f842..ad1b50f 100644
--- a/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc
+++ b/Source/Modulos/FicherosEDI/Cliente/FicherosEDI.drc
@@ -13,9 +13,9 @@ BEGIN
 END
 
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uAsistenteCargaFicheros.dfm */
-/* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uDataModuleFicherosEDI.dfm */
+/* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uDataModuleFicherosEDI.DFM */
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uViewHistorialCargasEDI.dfm */
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uEditorHistorialCargasEDI.dfm */
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\uPluginControllerFicherosEDI.dfm */
 /* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\FicherosEDI.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3A.tmp */
+/* C:\Varela_D2007\Source\Modulos\FicherosEDI\Cliente\FicherosEDI.drf */
diff --git a/Source/Modulos/Parametros/Cliente/Parametros.drc b/Source/Modulos/Parametros/Cliente/Parametros.drc
index 7da7300..97071bf 100644
--- a/Source/Modulos/Parametros/Cliente/Parametros.drc
+++ b/Source/Modulos/Parametros/Cliente/Parametros.drc
@@ -12,9 +12,9 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uDataModuleParametros.dfm */
+/* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uDataModuleParametros.DFM */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosCentro.dfm */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosColeccion.dfm */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\uViewParametrosFecha.dfm */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\Parametros.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf36.tmp */
+/* C:\Varela_D2007\Source\Modulos\Parametros\Cliente\Parametros.drf */
diff --git a/Source/Modulos/Recepciones/Cliente/Recepciones.res b/Source/Modulos/Recepciones/Cliente/Recepciones.res
index bf4c1a4..784f75e 100644
Binary files a/Source/Modulos/Recepciones/Cliente/Recepciones.res and b/Source/Modulos/Recepciones/Cliente/Recepciones.res differ
diff --git a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
index 83a5883..f0b52c0 100644
--- a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
+++ b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
@@ -4,6 +4,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
   Caption = 'Control de recepciones'
   ClientHeight = 664
   ClientWidth = 816
+  ExplicitTop = -106
   ExplicitWidth = 824
   ExplicitHeight = 691
   PixelsPerInch = 96
@@ -117,7 +118,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
             Column = frViewListaRecepciones1.cxGridBandedViewDIFERENCIA
           end
           item
-            Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades'
+            Format = ',0;-,0'
             Kind = skSum
             Column = frViewListaRecepciones1.cxGridBandedViewDIFERENCIA
           end>
@@ -1634,7 +1635,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
   inherited dsDataTable: TDADataSource [10]
     Top = 136
   end
-  inherited GridPopupMenu: TPopupMenu
+  inherited GridPopupMenu: TPopupMenu [11]
     Left = 112
     Top = 128
     object Cambiarelestado1: TMenuItem [3]
diff --git a/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm b/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm
index 29c8f9f..1e6f923 100644
--- a/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm
+++ b/Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm
@@ -23,7 +23,7 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
           Column = cxGridBandedViewDIFERENCIA
         end
         item
-          Format = 'Diferencia: ,0 unidades;Diferencia: -,0 unidades'
+          Format = ',0;-,0'
           Kind = skSum
           Column = cxGridBandedViewDIFERENCIA
         end>
diff --git a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc
index 8847e11..855053a 100644
--- a/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc
+++ b/Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.drc
@@ -12,10 +12,10 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uDataModuleReferenciaGenerica.dfm */
+/* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uDataModuleReferenciaGenerica.DFM */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uViewListaReferenciaGenerica.dfm */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uEditorListaReferenciaGenerica.dfm */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uPluginControllerReferenciaGenerica.dfm */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\uEditorCambioReferenciaGenerica.dfm */
 /* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\ReferenciaGenerica.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf40.tmp */
+/* C:\Varela_D2007\Source\Modulos\ReferenciaGenerica\Cliente\ReferenciaGenerica.drf */
diff --git a/Source/Modulos/Stock/Cliente/Stock.drc b/Source/Modulos/Stock/Cliente/Stock.drc
index 8439e96..609d96f 100644
--- a/Source/Modulos/Stock/Cliente/Stock.drc
+++ b/Source/Modulos/Stock/Cliente/Stock.drc
@@ -12,7 +12,7 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uDataModuleStock.dfm */
+/* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uDataModuleStock.DFM */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uViewControGridStockEDI.dfm */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uViewControGridStockPrendasCentros.dfm */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uViewControGridStockEDIInventario.dfm */
@@ -21,4 +21,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uEditorControlStockVARELA.dfm */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\uPluginControllerStock.dfm */
 /* C:\Varela_D2007\Source\Modulos\Stock\Cliente\Stock.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf48.tmp */
+/* C:\Varela_D2007\Source\Modulos\Stock\Cliente\Stock.drf */
diff --git a/Source/Modulos/Traspasos/Cliente/Traspasos.drc b/Source/Modulos/Traspasos/Cliente/Traspasos.drc
index ea46ab5..b92e7f2 100644
--- a/Source/Modulos/Traspasos/Cliente/Traspasos.drc
+++ b/Source/Modulos/Traspasos/Cliente/Traspasos.drc
@@ -12,10 +12,10 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uDataModuleTraspasos.dfm */
+/* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uDataModuleTraspasos.DFM */
 /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uViewListaTraspasos.dfm */
 /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uEditorListaTraspasos.dfm */
 /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uPluginControllerTraspasos.dfm */
 /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\uEditorAjustarTraspasos.dfm */
 /* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\Traspasos.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf46.tmp */
+/* C:\Varela_D2007\Source\Modulos\Traspasos\Cliente\Traspasos.drf */
diff --git a/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas b/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas
index 4d0f427..b836701 100644
--- a/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas
+++ b/Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas
@@ -581,7 +581,7 @@ var
 begin
   inherited;
 
-  Val1 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
+  Val1 := AText + ' ' + Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewPRODUCTO.Index];
   Val2 := Sender.GridView.DataController.DisplayTexts[ARecordIndex, cxGridViewCOLOR.Index];
   AText := 'Producto: ' + Val1 + ' - Color: ' + Val2;
 end;
diff --git a/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc b/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc
index 7227262..098f26d 100644
--- a/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc
+++ b/Source/Modulos/VentasProceso/Cliente/VentasProceso.drc
@@ -12,7 +12,7 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uDataModuleVentasProceso.dfm */
+/* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uDataModuleVentasProceso.DFM */
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uViewControlesVentaProceso.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uEditorControlesVentaProceso.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uPluginControllerVentasProceso.dfm */
@@ -20,4 +20,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uViewControlVentaProceso.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\uEditorControlVentaProceso.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\VentasProceso.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3E.tmp */
+/* C:\Varela_D2007\Source\Modulos\VentasProceso\Cliente\VentasProceso.drf */
diff --git a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc
index 4860c56..99d0438 100644
--- a/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc
+++ b/Source/Modulos/VentasTerminadas/Cliente/VentasTerminadas.drc
@@ -12,7 +12,7 @@ STRINGTABLE
 BEGIN
 END
 
-/* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uDataModuleVentasTerminadas.dfm */
+/* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uDataModuleVentasTerminadas.DFM */
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uViewControlesVentasTerminadas.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uEditorControlesVentasTerminadas.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uViewControGridlVentasTerminadas.dfm */
@@ -22,4 +22,4 @@ END
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uPluginControllerVentasTerminadas.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\uEditorControlVentasTerminadas.dfm */
 /* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\VentasTerminadas.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf3C.tmp */
+/* C:\Varela_D2007\Source\Modulos\VentasTerminadas\Cliente\VentasTerminadas.drf */
diff --git a/Source/Servidor/AdminPV_Server.dproj b/Source/Servidor/AdminPV_Server.dproj
index d78046a..05e95c8 100644
--- a/Source/Servidor/AdminPV_Server.dproj
+++ b/Source/Servidor/AdminPV_Server.dproj
@@ -1,192 +1,199 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<ProjectGuid>{86364157-b301-43dd-bfad-250a58064559}</ProjectGuid>
-		<MainSource>AdminPV_Server.dpr</MainSource>
-		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\AdminPV_Server.exe</DCC_DependencyCheckOutputName>
-		<DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dbxcds;DbxCommonDriver;dbexpress;dsnapcon;vclib;ibxpress;adortl;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;xmlrtl;RemObjects_Core_D10;RemObjects_WebBroker_D10;RemObjects_RODX_D10;RemObjects_BPDX_D10;RemObjects_Synapse_D10;RemObjects_Indy_D10;DataAbstract_Core_D10;DataAbstract_IDE_D10;DataAbstract_DBXDriver_D10B;DataAbstract_SQLiteDriver_D10;DataAbstract_Scripting_D10;PascalScript_RO_D10;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;fqb100;frx10;frxADO10;frxBDE10;frxDB10;frxe10;frxIBX10;fs10;fsADO10;fsBDE10;fsDB10;fsIBX10;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;ccpack10dsg;ccpack10;EasyListviewD10;GUISDK_D10;JvAppFrmD10R;JvCoreD10R;JclVcl;Jcl;JvSystemD10R;JvStdCtrlsD10R;JvBandsD10R;JvDBD10R;JvDlgsD10R;JvBDED10R;JvCmpD10R;JvCryptD10R;JvCtrlsD10R;JvCustomD10R;JvDockingD10R;JvDotNetCtrlsD10R;JvEDID10R;JvGlobusD10R;JvHMID10R;JvInterpreterD10R;JvJansD10R;JvManagedThreadsD10R;JvMMD10R;JvPageCompsD10R;JvPrintPreviewD10R;JvRuntimeDesignD10R;JvTimeFrameworkD10R;JvUIBD10R;JvValidatorsD10R;JvWizardD10R;JvXPCtrlsD10R;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;RemObjects_DataSnap_D10</DCC_UsePackage>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<Version>7.0</Version>
-		<DCC_DebugInformation>False</DCC_DebugInformation>
-		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-		<DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-		<DCC_DcuOutput>.\</DCC_DcuOutput>
-		<DCC_ObjOutput>.\</DCC_ObjOutput>
-		<DCC_HppOutput>.\</DCC_HppOutput>
-		<DCC_UnitSearchPath>..\Lib;..\Base</DCC_UnitSearchPath>
-		<DCC_ResourcePath>..\Lib;..\Base</DCC_ResourcePath>
-		<DCC_ObjPath>..\Lib;..\Base</DCC_ObjPath>
-		<DCC_IncludePath>..\Lib;..\Base</DCC_IncludePath>
-		<DCC_Define>RELEASE</DCC_Define>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<Version>7.0</Version>
-		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-		<DCC_MapFile>3</DCC_MapFile>
-		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-		<DCC_DcuOutput>.\</DCC_DcuOutput>
-		<DCC_ObjOutput>.\</DCC_ObjOutput>
-		<DCC_HppOutput>.\</DCC_HppOutput>
-		<DCC_UnitSearchPath>..\Lib;..\Base</DCC_UnitSearchPath>
-		<DCC_ResourcePath>..\Lib;..\Base</DCC_ResourcePath>
-		<DCC_ObjPath>..\Lib;..\Base</DCC_ObjPath>
-		<DCC_IncludePath>..\Lib;..\Base</DCC_IncludePath>
-		<DCC_Define>DEBUG;</DCC_Define>
-	</PropertyGroup>
-	<ProjectExtensions>
-		<Borland.Personality>Delphi.Personality</Borland.Personality>
-		<Borland.ProjectType>VCLApplication</Borland.ProjectType>
-		<BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 09 de mayo de 2008 11:23</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><Excluded_Packages>
-						<Excluded_Packages Name="C:\Varela_D2007\Lib\DevExpressVCL\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
-						<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
-						<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
-						<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
-						<Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-						<Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
-						<Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
-					</Excluded_Packages></Delphi.Personality></BorlandProject></BorlandProject>
-	</ProjectExtensions>
-	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
-	<ItemGroup>
-		<DelphiCompile Include="AdminPV_Server.dpr">
-			<MainSource>MainSource</MainSource>
-		</DelphiCompile>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
-		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
-			<Form>srvUsuarios</Form>
-			<DesignClass>TDataAbstractService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Base\Utiles\uDataTableUtils.pas"/>
-		<DCCReference Include="..\Base\Utiles\uDBSelectionList.pas"/>
-		<DCCReference Include="..\Base\Utiles\uIntegerList.pas"/>
-		<DCCReference Include="..\ControlesBase\Reglas\schControlesClient_Intf.pas"/>
-		<DCCReference Include="..\ControlesBase\Reglas\schControlesServer_Intf.pas"/>
-		<DCCReference Include="..\ControlesBase\Servidor\srvControles_Impl.pas">
-			<Form>srvControles</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Devoluciones\Servidor\srvDevoluciones_Impl.pas">
-			<Form>srvDevoluciones</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\FicherosEDI\Reglas\schEDILogClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\FicherosEDI\Reglas\schEDILogServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Parametros\Reglas\schParametrosClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Parametros\Reglas\schParametrosServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Parametros\Servidor\srvParametros_Impl.pas">
-			<Form>srvParametros</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Recepciones\Servidor\srvRecepciones_Impl.pas">
-			<Form>srvRecepciones</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\uBizReferenciaGenericaServer.pas"/>
-		<DCCReference Include="..\Modulos\ReferenciaGenerica\Servidor\srvReferenciaGenerica_Impl.pas">
-			<Form>srvReferenciaGenerica</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Stock\Reglas\schStockClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Stock\Reglas\schStockServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\Stock\Servidor\srvStock_Impl.pas">
-			<Form>srvStock</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Traspasos\Servidor\srvTraspasos_Impl.pas">
-			<Form>srvTraspasos</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\VentasProceso\Reglas\schVentasEnProcesoClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\VentasProceso\Reglas\schVentasEnProcesoServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\VentasProceso\Servidor\srvVentasEnProceso_Impl.pas">
-			<Form>srvVentasEnProceso</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasServer_Intf.pas"/>
-		<DCCReference Include="..\Modulos\VentasTerminadas\Servidor\srvVentasTerminadas_Impl.pas">
-			<Form>srvVentasTerminadas</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="..\Servicios\VARELA_Intf.pas"/>
-		<DCCReference Include="..\Servicios\VARELA_Invk.pas"/>
-		<DCCReference Include="Configuracion\uConexionBD.pas">
-			<Form>frConexionBD</Form>
-			<DesignClass>TFrame</DesignClass>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConfFicherosEDI.pas">
-			<Form>frConfFicherosEDI</Form>
-			<DesignClass>TFrame</DesignClass>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConfGeneral.pas">
-			<Form>frConfGeneral</Form>
-			<DesignClass>TFrame</DesignClass>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConfiguracion.pas">
-			<Form>fConfiguracion</Form>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-			<Form>FrameConfiguracion</Form>
-			<DesignClass>TFrame</DesignClass>
-		</DCCReference>
-		<DCCReference Include="EDI\EDI_Inventary_Impl.pas"/>
-		<DCCReference Include="EDI\EDI_INVRPT.pas"/>
-		<DCCReference Include="EDI\EDI_Log_Impl.pas"/>
-		<DCCReference Include="EDI\EDI_Reader.pas"/>
-		<DCCReference Include="EDI\EDI_Sales_Impl.pas"/>
-		<DCCReference Include="EDI\EDI_SLSRPT.pas"/>
-		<DCCReference Include="fServerForm.pas">
-			<Form>ServerForm</Form>
-		</DCCReference>
-		<DCCReference Include="Login_Impl.pas"/>
-		<DCCReference Include="Services\EDI_Inventary\schEDIInventaryClient_Intf.pas"/>
-		<DCCReference Include="Services\EDI_Inventary\schEDIInventaryServer_Intf.pas"/>
-		<DCCReference Include="Services\EDI_Inventary\uBizEDIInventary.pas"/>
-		<DCCReference Include="Services\EDI_Inventary\uDataModuleEDI_Inventary.pas">
-			<Form>dmEDIInventary</Form>
-			<DesignClass>TDataModule</DesignClass>
-		</DCCReference>
-		<DCCReference Include="Services\EDI_Sales\schEDISalesClient_Intf.pas"/>
-		<DCCReference Include="Services\EDI_Sales\schEDISalesServer_Intf.pas"/>
-		<DCCReference Include="Services\EDI_Sales\uBizEDISales.pas"/>
-		<DCCReference Include="Services\EDI_Sales\uDataModuleEDI_Sales.pas">
-			<Form>dmEDISales</Form>
-			<DesignClass>TDataModule</DesignClass>
-		</DCCReference>
-		<DCCReference Include="Services\Login\srvLogin_Impl.pas">
-			<Form>srvLogin</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="Services\TransferenciaFicheros\srvTransfereciaFicheros_Impl.pas">
-			<Form>srvTransfereciaFicheros</Form>
-			<DesignClass>TRORemoteDataModule</DesignClass>
-		</DCCReference>
-		<DCCReference Include="srvInformes_Impl.pas">
-			<Form>srvInformes</Form>
-			<DesignClass>TDARemoteService</DesignClass>
-		</DCCReference>
-		<DCCReference Include="uAcercaDe.pas">
-			<Form>fAcercaDe</Form>
-		</DCCReference>
-		<DCCReference Include="uDataModuleServer.pas">
-			<Form>dmServer</Form>
-			<DesignClass>TDataModule</DesignClass>
-		</DCCReference>
-		<DCCReference Include="Utiles\EDI_Utils.pas"/>
-		<DCCReference Include="Utiles\RegExpr.pas"/>
-		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
-	</ItemGroup>
+  <PropertyGroup>
+    <ProjectGuid>{86364157-b301-43dd-bfad-250a58064559}</ProjectGuid>
+    <MainSource>AdminPV_Server.dpr</MainSource>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\AdminPV_Server.exe</DCC_DependencyCheckOutputName>
+    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dbxcds;DbxCommonDriver;dbexpress;dsnapcon;vclib;ibxpress;adortl;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;xmlrtl;RemObjects_Core_D10;RemObjects_WebBroker_D10;RemObjects_RODX_D10;RemObjects_BPDX_D10;RemObjects_Synapse_D10;RemObjects_Indy_D10;DataAbstract_Core_D10;DataAbstract_IDE_D10;DataAbstract_DBXDriver_D10B;DataAbstract_SQLiteDriver_D10;DataAbstract_Scripting_D10;PascalScript_RO_D10;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;fqb100;frx10;frxADO10;frxBDE10;frxDB10;frxe10;frxIBX10;fs10;fsADO10;fsBDE10;fsDB10;fsIBX10;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;ccpack10dsg;ccpack10;EasyListviewD10;GUISDK_D10;JvAppFrmD10R;JvCoreD10R;JclVcl;Jcl;JvSystemD10R;JvStdCtrlsD10R;JvBandsD10R;JvDBD10R;JvDlgsD10R;JvBDED10R;JvCmpD10R;JvCryptD10R;JvCtrlsD10R;JvCustomD10R;JvDockingD10R;JvDotNetCtrlsD10R;JvEDID10R;JvGlobusD10R;JvHMID10R;JvInterpreterD10R;JvJansD10R;JvManagedThreadsD10R;JvMMD10R;JvPageCompsD10R;JvPrintPreviewD10R;JvRuntimeDesignD10R;JvTimeFrameworkD10R;JvUIBD10R;JvValidatorsD10R;JvWizardD10R;JvXPCtrlsD10R;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;RemObjects_DataSnap_D10</DCC_UsePackage>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_DebugInformation>False</DCC_DebugInformation>
+    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+    <DCC_DcuOutput>.\</DCC_DcuOutput>
+    <DCC_ObjOutput>.\</DCC_ObjOutput>
+    <DCC_HppOutput>.\</DCC_HppOutput>
+    <DCC_UnitSearchPath>..\Lib;..\Base</DCC_UnitSearchPath>
+    <DCC_ResourcePath>..\Lib;..\Base</DCC_ResourcePath>
+    <DCC_ObjPath>..\Lib;..\Base</DCC_ObjPath>
+    <DCC_IncludePath>..\Lib;..\Base</DCC_IncludePath>
+    <DCC_Define>RELEASE</DCC_Define>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <Version>7.0</Version>
+    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+    <DCC_MapFile>3</DCC_MapFile>
+    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+    <DCC_DcuOutput>.\</DCC_DcuOutput>
+    <DCC_ObjOutput>.\</DCC_ObjOutput>
+    <DCC_HppOutput>.\</DCC_HppOutput>
+    <DCC_UnitSearchPath>..\Lib;..\Base</DCC_UnitSearchPath>
+    <DCC_ResourcePath>..\Lib;..\Base</DCC_ResourcePath>
+    <DCC_ObjPath>..\Lib;..\Base</DCC_ObjPath>
+    <DCC_IncludePath>..\Lib;..\Base</DCC_IncludePath>
+    <DCC_Define>DEBUG;</DCC_Define>
+  </PropertyGroup>
+  <ProjectExtensions>
+    <Borland.Personality>Delphi.Personality</Borland.Personality>
+    <Borland.ProjectType>VCLApplication</Borland.ProjectType>
+    <BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">1</VersionInfo><VersionInfo Name="Release">4</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.1.4.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 16 de octubre de 2008 13:41</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
+      <Excluded_Packages Name="C:\Varela_D2007\Lib\DevExpressVCL\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
+      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
+    </Excluded_Packages></Delphi.Personality></BorlandProject></BorlandProject>
+  </ProjectExtensions>
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+  <ItemGroup>
+    <DelphiCompile Include="AdminPV_Server.dpr">
+      <MainSource>MainSource</MainSource>
+    </DelphiCompile>
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
+      <Form>srvUsuarios</Form>
+      <DesignClass>TDataAbstractService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Base\Utiles\uDataTableUtils.pas" />
+    <DCCReference Include="..\Base\Utiles\uDBSelectionList.pas" />
+    <DCCReference Include="..\Base\Utiles\uIntegerList.pas" />
+    <DCCReference Include="..\ControlesBase\Reglas\schControlesClient_Intf.pas" />
+    <DCCReference Include="..\ControlesBase\Reglas\schControlesServer_Intf.pas" />
+    <DCCReference Include="..\ControlesBase\Servidor\srvControles_Impl.pas">
+      <Form>srvControles</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Devoluciones\Servidor\srvDevoluciones_Impl.pas">
+      <Form>srvDevoluciones</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\FicherosEDI\Reglas\schEDILogClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\FicherosEDI\Reglas\schEDILogServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Parametros\Reglas\schParametrosClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Parametros\Reglas\schParametrosServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Parametros\Servidor\srvParametros_Impl.pas">
+      <Form>srvParametros</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Recepciones\Servidor\srvRecepciones_Impl.pas">
+      <Form>srvRecepciones</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\ReferenciaGenerica\Reglas\uBizReferenciaGenericaServer.pas" />
+    <DCCReference Include="..\Modulos\ReferenciaGenerica\Servidor\srvReferenciaGenerica_Impl.pas">
+      <Form>srvReferenciaGenerica</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Stock\Reglas\schStockClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\Stock\Reglas\schStockServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\Stock\Servidor\srvStock_Impl.pas">
+      <Form>srvStock</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Traspasos\Servidor\srvTraspasos_Impl.pas">
+      <Form>srvTraspasos</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\VentasProceso\Reglas\schVentasEnProcesoClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\VentasProceso\Reglas\schVentasEnProcesoServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\VentasProceso\Servidor\srvVentasEnProceso_Impl.pas">
+      <Form>srvVentasEnProceso</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasClient_Intf.pas" />
+    <DCCReference Include="..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasServer_Intf.pas" />
+    <DCCReference Include="..\Modulos\VentasTerminadas\Servidor\srvVentasTerminadas_Impl.pas">
+      <Form>srvVentasTerminadas</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="..\Servicios\VARELA_Intf.pas" />
+    <DCCReference Include="..\Servicios\VARELA_Invk.pas" />
+    <DCCReference Include="Configuracion\uConexionBD.pas">
+      <Form>frConexionBD</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConfFicherosEDI.pas">
+      <Form>frConfFicherosEDI</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConfGeneral.pas">
+      <Form>frConfGeneral</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConfiguracion.pas">
+      <Form>fConfiguracion</Form>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+      <Form>FrameConfiguracion</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
+    <DCCReference Include="EDI\EDI_Inventary_Impl.pas" />
+    <DCCReference Include="EDI\EDI_INVRPT.pas" />
+    <DCCReference Include="EDI\EDI_Log_Impl.pas" />
+    <DCCReference Include="EDI\EDI_Reader.pas" />
+    <DCCReference Include="EDI\EDI_Sales_Impl.pas" />
+    <DCCReference Include="EDI\EDI_SLSRPT.pas" />
+    <DCCReference Include="fServerForm.pas">
+      <Form>ServerForm</Form>
+    </DCCReference>
+    <DCCReference Include="Login_Impl.pas" />
+    <DCCReference Include="Services\EDI_Inventary\schEDIInventaryClient_Intf.pas" />
+    <DCCReference Include="Services\EDI_Inventary\schEDIInventaryServer_Intf.pas" />
+    <DCCReference Include="Services\EDI_Inventary\uBizEDIInventary.pas" />
+    <DCCReference Include="Services\EDI_Inventary\uDataModuleEDI_Inventary.pas">
+      <Form>dmEDIInventary</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Services\EDI_Sales\schEDISalesClient_Intf.pas" />
+    <DCCReference Include="Services\EDI_Sales\schEDISalesServer_Intf.pas" />
+    <DCCReference Include="Services\EDI_Sales\uBizEDISales.pas" />
+    <DCCReference Include="Services\EDI_Sales\uDataModuleEDI_Sales.pas">
+      <Form>dmEDISales</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Services\Login\srvLogin_Impl.pas">
+      <Form>srvLogin</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Services\TransferenciaFicheros\srvTransfereciaFicheros_Impl.pas">
+      <Form>srvTransfereciaFicheros</Form>
+      <DesignClass>TRORemoteDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="srvInformes_Impl.pas">
+      <Form>srvInformes</Form>
+      <DesignClass>TDARemoteService</DesignClass>
+    </DCCReference>
+    <DCCReference Include="uAcercaDe.pas">
+      <Form>fAcercaDe</Form>
+    </DCCReference>
+    <DCCReference Include="uDataModuleServer.pas">
+      <Form>dmServer</Form>
+      <DesignClass>TDataModule</DesignClass>
+    </DCCReference>
+    <DCCReference Include="Utiles\EDI_Utils.pas" />
+    <DCCReference Include="Utiles\RegExpr.pas" />
+    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
+  </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/AdminPV_Server.drc b/Source/Servidor/AdminPV_Server.drc
index 333ee1d..85f9f58 100644
--- a/Source/Servidor/AdminPV_Server.drc
+++ b/Source/Servidor/AdminPV_Server.drc
@@ -268,166 +268,166 @@
 #define pnglang_EPNGUnexpectedEndText 64333
 #define pnglang_EPNGNoImageDataText 64334
 #define pnglang_EPNGCannotChangeSizeText 64335
-#define DBXMetaDataReader_SIsLong 64336
-#define DBXMetaDataReader_SPastEndOfCursor 64337
-#define DBXMetaDataReader_SUnexpectedSymbol 64338
-#define DBXMetaDataReader_SLiteralPrefix 64339
-#define DBXMetaDataReader_SMinimumScale 64340
-#define DBXMetaDataReader_SLiteralSuffix 64341
-#define DBXMetaDataCommand_SBeforeRow 64342
-#define DBXMetaDataCommand_SAfterRow 64343
-#define DBXMetaDataCommandFactory_SUnknownDataType 64344
-#define DBXDynalink_SAdditionalInfo 64345
-#define DBXDynalink_SInvalidDataType 64346
-#define DBXDataStoreMetaDataReader_SCannotLoadMetaDataForJds7 64347
-#define DBXClient_ParameterNotSet 64348
-#define DBXPool_SConnectTimeout 64349
-#define DBXPool_SInvalidCommand 64350
-#define DBXTrace_SINVALID_TRACE_FLAG 64351
-#define DBXMetaDataReader_SIsAutoIncrement 64352
-#define DBXMetaDataReader_SRoleName 64353
-#define DBXMetaDataReader_SOrdinalOutOfRange 64354
-#define DBXMetaDataReader_SIsUnique 64355
-#define DBXMetaDataReader_SCreateFormat 64356
-#define DBXMetaDataReader_SPrimaryKeyName 64357
-#define DBXMetaDataReader_SUnknownTableType 64358
-#define DBXMetaDataReader_SColumnSize 64359
-#define DBXMetaDataReader_SPrimaryColumnName 64360
-#define DBXMetaDataReader_SIsAutoIncrementable 64361
-#define DBXMetaDataReader_SProcedureName 64362
-#define DBXMetaDataReader_STableCatalogName 64363
-#define DBXMetaDataReader_SReservedWord 64364
-#define DBXMetaDataReader_STableSchemaName 64365
-#define DBXMetaDataReader_STypeName 64366
-#define DBXMetaDataReader_SViewName 64367
-#define DBXMetaDataReader_SIsLiteralSupported 64368
-#define DBXMetaDataReader_SIsAscending 64369
-#define DBXMetaDataReader_SIsUnicode 64370
-#define DBXMetaDataReader_SPrecision 64371
-#define DBXMetaDataReader_SConstraintName 64372
-#define DBXMetaDataReader_SMustCallNextFirst 64373
-#define DBXMetaDataReader_SScale 64374
-#define DBXMetaDataReader_SIsNullable 64375
-#define DBXMetaDataReader_SWrongAccessorForType 64376
-#define DBXMetaDataReader_SExternalDefinition 64377
-#define DBXMetaDataReader_SForeignKeyName 64378
-#define DBXMetaDataReader_SIsSearchable 64379
-#define DBXMetaDataReader_SPrimarySchemaName 64380
-#define DBXMetaDataReader_SIsCaseSensitive 64381
-#define DBXMetaDataReader_SParameterName 64382
-#define DBXMetaDataReader_SIsUnsigned 64383
-#define DBXMetaDataReader_SCatalogName 64384
-#define DBXMetaDataReader_SIsBestMatch 64385
-#define DBXMetaDataReader_SMaximumScale 64386
-#define DBXMetaDataReader_SOrdinal 64387
-#define DBXMetaDataReader_SMaximumVersion 64388
-#define DBXMetaDataReader_SDefaultValue 64389
-#define DBXMetaDataReader_SPrimaryTableName 64390
-#define DBXMetaDataReader_SMinimumVersion 64391
-#define DBXMetaDataReader_SDefinition 64392
-#define DBXMetaDataReader_SColumnName 64393
-#define DBXMetaDataReader_SCreateParameters 64394
-#define DBXMetaDataReader_SIsConcurrencyType 64395
-#define DBXMetaDataReader_SDbxDataType 64396
-#define DBXMetaDataReader_STableType 64397
-#define DBXMetaDataReader_SMaxInline 64398
-#define DBXMetaDataReader_SUnclosedQuotes 64399
-#define DBXMetaDataReader_SDataType 64400
-#define DBXMetaDataReader_STableName 64401
-#define DBXMetaDataReader_SPackageName 64402
-#define DBXMetaDataReader_SIsSearchableWithLike 64403
-#define DBXMetaDataReader_SPrimaryCatalogName 64404
-#define DBXMetaDataReader_SIsPrimary 64405
-#define DBXMetaDataReader_SSchemaName 64406
-#define DBXMetaDataReader_SProviderDbType 64407
-#define DBXMetaDataReader_SSynonymName 64408
-#define DBXMetaDataReader_SProcedureType 64409
-#define DBXMetaDataReader_SParameterMode 64410
-#define DBXMetaDataReader_SMetaDataCommandExpected 64411
-#define DBXMetaDataReader_SMissingImplementation 64412
-#define DBXMetaDataReader_SIsFixedLength 64413
-#define DBXMetaDataReader_SIsFixedPrecisionScale 64414
-#define DBXMetaDataReader_SUserName 64415
-#define SqlConst_SMULTIPLETRANSNOTENABLED 64416
-#define SqlConst_SCONNECTIONFAILED 64417
-#define SqlConst_SDRIVERINITFAILED 64418
-#define SqlConst_SOPTLOCKFAILED 64419
-#define SqlConst_SINVALIDREF 64420
-#define SqlConst_SNOTABLE 64421
-#define SqlConst_SMISSINGPARAMINSQL 64422
-#define SqlConst_SNOTIMPLEMENTED 64423
-#define SqlConst_SDRIVERINCOMPATIBLE 64424
-#define SqlConst_SDriverNotInConfigFile 64425
-#define SqlConst_SObjectTypenameRequired 64426
-#define SqlConst_SCannotCreateFile 64427
-#define SqlConst_SUnknownDataType 64428
-#define DBXPlatformUtil_SIllegalArgument 64429
-#define DBXPlatformUtil_SUnsupportedOperation 64430
-#define DBXMetaDataReader_SIndexName 64431
-#define SqlConst_SINVALIDHNDL 64432
-#define SqlConst_SNOTSUPPORTED 64433
-#define SqlConst_SINVALIDTIME 64434
-#define SqlConst_SINVALIDXLATION 64435
-#define SqlConst_SOUTOFRANGE 64436
-#define SqlConst_SINVALIDPARAM 64437
-#define SqlConst_SEOF 64438
-#define SqlConst_SSQLPARAMNOTSET 64439
-#define SqlConst_SINVALIDUSRPASS 64440
-#define SqlConst_SINVALIDPRECISION 64441
-#define SqlConst_SINVALIDLEN 64442
-#define SqlConst_SINVALIDXISOLEVEL 64443
-#define SqlConst_SINVALIDTXNID 64444
-#define SqlConst_SDUPLICATETXNID 64445
-#define SqlConst_SDRIVERRESTRICTED 64446
-#define SqlConst_SLOCALTRANSACTIVE 64447
-#define SqlConst_SMissingDataBaseName 64448
-#define SqlConst_SMissingDriverName 64449
-#define SqlConst_SPrepareError 64450
-#define SqlConst_SObjectNameError 64451
-#define SqlConst_SSQLDataSetOpen 64452
-#define SqlConst_SNoActiveTrans 64453
-#define SqlConst_SActiveTrans 64454
-#define SqlConst_SMissingDriverRegFile 64455
-#define SqlConst_SNoCursor 64456
-#define SqlConst_SErrorMappingError 64457
-#define SqlConst_SStoredProcsNotSupported 64458
-#define SqlConst_SPackagesNotSupported 64459
-#define SqlConst_SNOERROR 64460
-#define SqlConst_SWARNING 64461
-#define SqlConst_SNOMEMORY 64462
-#define SqlConst_SINVALIDFLDTYPE 64463
-#define DBXCommon_SConnectionFactoryInitFailed 64464
-#define DBXCommon_SInvalidDelegationDepth 64465
-#define DBXCommon_SInvalidOrdinal 64466
-#define DBXCommon_SDefaultErrorMessage 64467
-#define DBXCommon_SAlreadyPrepared 64468
-#define DBXCommon_SInvalidTypeAccess 64469
-#define DBXCommon_SNoStatementToExecute 64470
-#define SqlConst_SLoginError 64471
-#define SqlConst_SMonitorActive 64472
-#define SqlConst_SDatabaseOpen 64473
-#define SqlConst_SDatabaseClosed 64474
-#define SqlConst_SMissingSQLConnection 64475
-#define SqlConst_SConnectionNameMissing 64476
-#define SqlConst_SEmptySQLStatement 64477
-#define SqlConst_SNoParameterValue 64478
-#define SqlConst_SNoSqlStatement 64479
+#define SqlConst_SDUPLICATETXNID 64336
+#define SqlConst_SDRIVERRESTRICTED 64337
+#define SqlConst_SLOCALTRANSACTIVE 64338
+#define SqlConst_SMULTIPLETRANSNOTENABLED 64339
+#define SqlConst_SCONNECTIONFAILED 64340
+#define SqlConst_SDRIVERINITFAILED 64341
+#define SqlConst_SOPTLOCKFAILED 64342
+#define SqlConst_SINVALIDREF 64343
+#define SqlConst_SNOTABLE 64344
+#define SqlConst_SMISSINGPARAMINSQL 64345
+#define SqlConst_SNOTIMPLEMENTED 64346
+#define SqlConst_SDRIVERINCOMPATIBLE 64347
+#define SqlConst_SDriverNotInConfigFile 64348
+#define SqlConst_SObjectTypenameRequired 64349
+#define SqlConst_SCannotCreateFile 64350
+#define SqlConst_SUnknownDataType 64351
+#define SqlConst_SWARNING 64352
+#define SqlConst_SNOMEMORY 64353
+#define SqlConst_SINVALIDFLDTYPE 64354
+#define SqlConst_SINVALIDHNDL 64355
+#define SqlConst_SNOTSUPPORTED 64356
+#define SqlConst_SINVALIDTIME 64357
+#define SqlConst_SINVALIDXLATION 64358
+#define SqlConst_SOUTOFRANGE 64359
+#define SqlConst_SINVALIDPARAM 64360
+#define SqlConst_SEOF 64361
+#define SqlConst_SSQLPARAMNOTSET 64362
+#define SqlConst_SINVALIDUSRPASS 64363
+#define SqlConst_SINVALIDPRECISION 64364
+#define SqlConst_SINVALIDLEN 64365
+#define SqlConst_SINVALIDXISOLEVEL 64366
+#define SqlConst_SINVALIDTXNID 64367
+#define SqlConst_SEmptySQLStatement 64368
+#define SqlConst_SNoParameterValue 64369
+#define SqlConst_SNoSqlStatement 64370
+#define SqlConst_SMissingDataBaseName 64371
+#define SqlConst_SMissingDriverName 64372
+#define SqlConst_SPrepareError 64373
+#define SqlConst_SObjectNameError 64374
+#define SqlConst_SSQLDataSetOpen 64375
+#define SqlConst_SNoActiveTrans 64376
+#define SqlConst_SActiveTrans 64377
+#define SqlConst_SMissingDriverRegFile 64378
+#define SqlConst_SNoCursor 64379
+#define SqlConst_SErrorMappingError 64380
+#define SqlConst_SStoredProcsNotSupported 64381
+#define SqlConst_SPackagesNotSupported 64382
+#define SqlConst_SNOERROR 64383
+#define DBXMetaDataCommand_SBeforeRow 64384
+#define DBXMetaDataCommand_SAfterRow 64385
+#define DBXMetaDataCommandFactory_SUnknownDataType 64386
+#define DBXDynalink_SAdditionalInfo 64387
+#define DBXDynalink_SInvalidDataType 64388
+#define DBXDataStoreMetaDataReader_SCannotLoadMetaDataForJds7 64389
+#define DBXClient_ParameterNotSet 64390
+#define DBXPool_SConnectTimeout 64391
+#define DBXPool_SInvalidCommand 64392
+#define DBXTrace_SINVALID_TRACE_FLAG 64393
+#define SqlConst_SLoginError 64394
+#define SqlConst_SMonitorActive 64395
+#define SqlConst_SDatabaseOpen 64396
+#define SqlConst_SDatabaseClosed 64397
+#define SqlConst_SMissingSQLConnection 64398
+#define SqlConst_SConnectionNameMissing 64399
+#define DBXMetaDataReader_SUnknownTableType 64400
+#define DBXMetaDataReader_SColumnSize 64401
+#define DBXMetaDataReader_SPrimaryColumnName 64402
+#define DBXMetaDataReader_SIsAutoIncrementable 64403
+#define DBXMetaDataReader_SProcedureName 64404
+#define DBXMetaDataReader_STableCatalogName 64405
+#define DBXMetaDataReader_SReservedWord 64406
+#define DBXMetaDataReader_STableSchemaName 64407
+#define DBXMetaDataReader_STypeName 64408
+#define DBXMetaDataReader_SViewName 64409
+#define DBXMetaDataReader_SIsLong 64410
+#define DBXMetaDataReader_SPastEndOfCursor 64411
+#define DBXMetaDataReader_SUnexpectedSymbol 64412
+#define DBXMetaDataReader_SLiteralPrefix 64413
+#define DBXMetaDataReader_SMinimumScale 64414
+#define DBXMetaDataReader_SLiteralSuffix 64415
+#define DBXMetaDataReader_SScale 64416
+#define DBXMetaDataReader_SIsNullable 64417
+#define DBXMetaDataReader_SWrongAccessorForType 64418
+#define DBXMetaDataReader_SExternalDefinition 64419
+#define DBXMetaDataReader_SForeignKeyName 64420
+#define DBXMetaDataReader_SIsSearchable 64421
+#define DBXMetaDataReader_SPrimarySchemaName 64422
+#define DBXMetaDataReader_SIsCaseSensitive 64423
+#define DBXMetaDataReader_SParameterName 64424
+#define DBXMetaDataReader_SIsUnsigned 64425
+#define DBXMetaDataReader_SIsAutoIncrement 64426
+#define DBXMetaDataReader_SRoleName 64427
+#define DBXMetaDataReader_SOrdinalOutOfRange 64428
+#define DBXMetaDataReader_SIsUnique 64429
+#define DBXMetaDataReader_SCreateFormat 64430
+#define DBXMetaDataReader_SPrimaryKeyName 64431
+#define DBXMetaDataReader_SPrimaryTableName 64432
+#define DBXMetaDataReader_SMinimumVersion 64433
+#define DBXMetaDataReader_SDefinition 64434
+#define DBXMetaDataReader_SColumnName 64435
+#define DBXMetaDataReader_SCreateParameters 64436
+#define DBXMetaDataReader_SIsConcurrencyType 64437
+#define DBXMetaDataReader_SDbxDataType 64438
+#define DBXMetaDataReader_STableType 64439
+#define DBXMetaDataReader_SMaxInline 64440
+#define DBXMetaDataReader_SUnclosedQuotes 64441
+#define DBXMetaDataReader_SIsLiteralSupported 64442
+#define DBXMetaDataReader_SIsAscending 64443
+#define DBXMetaDataReader_SIsUnicode 64444
+#define DBXMetaDataReader_SPrecision 64445
+#define DBXMetaDataReader_SConstraintName 64446
+#define DBXMetaDataReader_SMustCallNextFirst 64447
+#define DBXMetaDataReader_SSchemaName 64448
+#define DBXMetaDataReader_SProviderDbType 64449
+#define DBXMetaDataReader_SSynonymName 64450
+#define DBXMetaDataReader_SProcedureType 64451
+#define DBXMetaDataReader_SParameterMode 64452
+#define DBXMetaDataReader_SMetaDataCommandExpected 64453
+#define DBXMetaDataReader_SMissingImplementation 64454
+#define DBXMetaDataReader_SIsFixedLength 64455
+#define DBXMetaDataReader_SIsFixedPrecisionScale 64456
+#define DBXMetaDataReader_SUserName 64457
+#define DBXMetaDataReader_SCatalogName 64458
+#define DBXMetaDataReader_SIsBestMatch 64459
+#define DBXMetaDataReader_SMaximumScale 64460
+#define DBXMetaDataReader_SOrdinal 64461
+#define DBXMetaDataReader_SMaximumVersion 64462
+#define DBXMetaDataReader_SDefaultValue 64463
+#define DBXCommon_SReaderClosed 64464
+#define DBXCommon_SReadOnlyType 64465
+#define DBXCommon_SConnectionFactoryInitFailed 64466
+#define DBXCommon_SInvalidDelegationDepth 64467
+#define DBXCommon_SInvalidOrdinal 64468
+#define DBXCommon_SDefaultErrorMessage 64469
+#define DBXCommon_SAlreadyPrepared 64470
+#define DBXCommon_SInvalidTypeAccess 64471
+#define DBXCommon_SNoStatementToExecute 64472
+#define DBXMetaDataReader_SIndexName 64473
+#define DBXMetaDataReader_SDataType 64474
+#define DBXMetaDataReader_STableName 64475
+#define DBXMetaDataReader_SPackageName 64476
+#define DBXMetaDataReader_SIsSearchableWithLike 64477
+#define DBXMetaDataReader_SPrimaryCatalogName 64478
+#define DBXMetaDataReader_SIsPrimary 64479
 #define bdeconst_SLocalTransDirty 64480
-#define ClassRegistry_SAlreadyRegistered 64481
-#define ClassRegistry_SNotRegistered 64482
-#define ClassRegistry_SInvalidClassRegister 64483
-#define ClassRegistry_SCannotFreeClassRegistry 64484
-#define DBXCommon_SDllLoadError 64485
-#define DBXCommon_SDllProcLoadError 64486
-#define DBXCommon_SUnknownDriver 64487
-#define DBXCommon_SInvalidArgument 64488
-#define DBXCommon_SInvalidTransaction 64489
-#define DBXCommon_SNotImplemented 64490
-#define DBXCommon_SRequiredProperty 64491
-#define DBXCommon_SDriverLoadError 64492
-#define DBXCommon_SReaderNew 64493
-#define DBXCommon_SReaderClosed 64494
-#define DBXCommon_SReadOnlyType 64495
+#define DBXPlatformUtil_SIllegalArgument 64481
+#define DBXPlatformUtil_SUnsupportedOperation 64482
+#define ClassRegistry_SAlreadyRegistered 64483
+#define ClassRegistry_SNotRegistered 64484
+#define ClassRegistry_SInvalidClassRegister 64485
+#define ClassRegistry_SCannotFreeClassRegistry 64486
+#define DBXCommon_SDllLoadError 64487
+#define DBXCommon_SDllProcLoadError 64488
+#define DBXCommon_SUnknownDriver 64489
+#define DBXCommon_SInvalidArgument 64490
+#define DBXCommon_SInvalidTransaction 64491
+#define DBXCommon_SNotImplemented 64492
+#define DBXCommon_SRequiredProperty 64493
+#define DBXCommon_SDriverLoadError 64494
+#define DBXCommon_SReaderNew 64495
 #define bdeconst_SHandleError 64496
 #define bdeconst_SNoReferenceTableName 64497
 #define bdeconst_SEmptySQLStatement 64498
@@ -460,12 +460,12 @@
 #define bdeconst_SDatabaseClosed 64525
 #define bdeconst_SDatabaseHandleSet 64526
 #define bdeconst_SSessionActive 64527
-#define IBXConst_SNoTimers 64528
-#define IBXConst_SIB65feature 64529
-#define IBXConst_SLoginPromptFailure 64530
-#define IBXConst_SIB70feature 64531
-#define IBXConst_SIB71feature 64532
-#define IBXConst_SIB80feature 64533
+#define IBSQLMonitor_StrCommitHardComm 64528
+#define IBSQLMonitor_StrCommitRetaining 64529
+#define IBSQLMonitor_StrRollback 64530
+#define IBSQLMonitor_StrRollbackRetainin 64531
+#define IBSQLMonitor_StrStartTransaction 64532
+#define IBSQLMonitor_StrApplication 64533
 #define ADOConst_SMissingConnection 64534
 #define ADOConst_SNoDetailFilter 64535
 #define ADOConst_SBookmarksRequired 64536
@@ -476,150 +476,150 @@
 #define ADOConst_SUsupportedFieldType 64541
 #define ADOConst_SConnectionRequired 64542
 #define ADOConst_SCantRequery 64543
-#define IBXConst_SDelphiException 64544
-#define IBXConst_SNoOptionsSet 64545
-#define IBXConst_SNoDestinationDirectory 64546
-#define IBXConst_SNosourceDirectory 64547
-#define IBXConst_SNoUninstallFile 64548
-#define IBXConst_SOptionNeedsClient 64549
-#define IBXConst_SOptionNeedsServer 64550
-#define IBXConst_SInvalidOption 64551
-#define IBXConst_SInvalidOnErrorResult 64552
-#define IBXConst_SInvalidOnStatusResult 64553
-#define IBXConst_SDPBConstantUnknownEx 64554
-#define IBXConst_STPBConstantUnknownEx 64555
-#define IBXConst_SUnknownPlan 64556
-#define IBXConst_SFieldSizeMismatch 64557
-#define IBXConst_SEventAlreadyRegistered 64558
-#define IBXConst_SStringTooLarge 64559
-#define IBXConst_SSPBConstantNotSupported 64560
-#define IBXConst_SSPBConstantUnknown 64561
-#define IBXConst_SServiceActive 64562
-#define IBXConst_SServiceInActive 64563
-#define IBXConst_SServerNameMissing 64564
-#define IBXConst_SQueryParamsError 64565
-#define IBXConst_SStartParamsError 64566
-#define IBXConst_SOutputParsingError 64567
-#define IBXConst_SUseSpecificProcedures 64568
-#define IBXConst_SSQLMonitorAlreadyPresent 64569
-#define IBXConst_SCantPrintValue 64570
-#define IBXConst_SEOFReached 64571
-#define IBXConst_SEOFInComment 64572
-#define IBXConst_SEOFInString 64573
-#define IBXConst_SParamNameExpected 64574
-#define IBXConst_SSuccess 64575
-#define IBXConst_SNotLiveRequest 64576
-#define IBXConst_SNoProvider 64577
-#define IBXConst_SNoRecordsAffected 64578
-#define IBXConst_SNoTableName 64579
-#define IBXConst_SCannotCreatePrimaryIndex 64580
-#define IBXConst_SCannotDropSystemIndex 64581
-#define IBXConst_STableNameMismatch 64582
-#define IBXConst_SIndexFieldMissing 64583
-#define IBXConst_SInvalidCancellation 64584
-#define IBXConst_SInvalidEvent 64585
-#define IBXConst_SMaximumEvents 64586
-#define IBXConst_SNoEventsRegistered 64587
-#define IBXConst_SInvalidQueueing 64588
-#define IBXConst_SInvalidRegistration 64589
-#define IBXConst_SInvalidBatchMove 64590
-#define IBXConst_SSQLDialectInvalid 64591
-#define IBXConst_SUserAbort 64592
-#define IBXConst_SDataSetUniDirectional 64593
-#define IBXConst_SCannotCreateSharedResource 64594
-#define IBXConst_SWindowsAPIError 64595
-#define IBXConst_SColumnListsDontMatch 64596
-#define IBXConst_SColumnTypesDontMatch 64597
-#define IBXConst_SCantEndSharedTransaction 64598
-#define IBXConst_SFieldUnsupportedType 64599
-#define IBXConst_SCircularDataLink 64600
-#define IBXConst_SEmptySQLStatement 64601
-#define IBXConst_SIsASelectStatement 64602
-#define IBXConst_SRequiredParamNotSet 64603
-#define IBXConst_SNoStoredProcName 64604
-#define IBXConst_SIsAExecuteProcedure 64605
-#define IBXConst_SUpdateFailed 64606
-#define IBXConst_SNotCachedUpdates 64607
-#define IBXConst_SBlobCannotBeRead 64608
-#define IBXConst_SBlobCannotBeWritten 64609
-#define IBXConst_SEmptyQuery 64610
-#define IBXConst_SCannotOpenNonSQLSelect 64611
-#define IBXConst_SNoFieldAccess 64612
-#define IBXConst_SFieldReadOnly 64613
-#define IBXConst_SFieldNotFound 64614
-#define IBXConst_SNotEditing 64615
-#define IBXConst_SCannotInsert 64616
-#define IBXConst_SCannotPost 64617
-#define IBXConst_SCannotUpdate 64618
-#define IBXConst_SCannotDelete 64619
-#define IBXConst_SCannotRefresh 64620
-#define IBXConst_SBufferNotSet 64621
-#define IBXConst_SCircularReference 64622
-#define IBXConst_SSQLParseError 64623
-#define IBXConst_SDatabaseNotAssigned 64624
-#define IBXConst_STransactionNotAssigned 64625
-#define IBXConst_SXSQLDAIndexOutOfRange 64626
-#define IBXConst_SXSQLDANameDoesNotExist 64627
-#define IBXConst_SEOF 64628
-#define IBXConst_SBOF 64629
-#define IBXConst_SInvalidStatementHandle 64630
-#define IBXConst_SSQLOpen 64631
-#define IBXConst_SSQLClosed 64632
-#define IBXConst_SDatasetOpen 64633
-#define IBXConst_SDatasetClosed 64634
-#define IBXConst_SUnknownSQLDataType 64635
-#define IBXConst_SInvalidColumnIndex 64636
-#define IBXConst_SInvalidParamColumnIndex 64637
-#define IBXConst_SInvalidDataConversion 64638
-#define IBXConst_SColumnIsNotNullable 64639
-#define IBXConst_SCannotSetDatabase 64640
-#define IBXConst_SCannotSetTransaction 64641
-#define IBXConst_SOperationCancelled 64642
-#define IBXConst_SDPBConstantNotSupported 64643
-#define IBXConst_SDPBConstantUnknown 64644
-#define IBXConst_STPBConstantNotSupported 64645
-#define IBXConst_STPBConstantUnknown 64646
-#define IBXConst_SDatabaseClosed 64647
-#define IBXConst_SDatabaseOpen 64648
-#define IBXConst_SDatabaseNameMissing 64649
-#define IBXConst_SNotInTransaction 64650
-#define IBXConst_SInTransaction 64651
-#define IBXConst_STimeoutNegative 64652
-#define IBXConst_SNoDatabasesInTransaction 64653
-#define IBXConst_SUpdateWrongDB 64654
-#define IBXConst_SUpdateWrongTR 64655
-#define IBSQLMonitor_StrPlan 64656
-#define IBSQLMonitor_StrPlanCantRetrive 64657
-#define IBSQLMonitor_StrCommitHardComm 64658
-#define IBSQLMonitor_StrCommitRetaining 64659
-#define IBSQLMonitor_StrRollback 64660
-#define IBSQLMonitor_StrRollbackRetainin 64661
-#define IBSQLMonitor_StrStartTransaction 64662
-#define IBSQLMonitor_StrApplication 64663
-#define IBXConst_SUnknownError 64664
-#define IBXConst_SInterBaseMissing 64665
-#define IBXConst_SInterBaseInstallMissing 64666
-#define IBXConst_SIB60feature 64667
-#define IBXConst_SNotSupported 64668
-#define IBXConst_SNotPermitted 64669
-#define IBXConst_SFileAccessError 64670
-#define IBXConst_SConnectionTimeout 64671
+#define IBXConst_SIB80feature 64544
+#define IBSQLMonitor_StrConnect 64545
+#define IBSQLMonitor_StrDisconnect 64546
+#define IBSQLMonitor_StrMisc 64547
+#define IBSQLMonitor_StrError 64548
+#define IBSQLMonitor_StrAttach 64549
+#define IBSQLMonitor_StrDetach 64550
+#define IBSQLMonitor_StrQuery 64551
+#define IBSQLMonitor_StrStart 64552
+#define IBSQLMonitor_StrExecute 64553
+#define IBSQLMonitor_StrNULL 64554
+#define IBSQLMonitor_StrBLOB 64555
+#define IBSQLMonitor_StrFetch 64556
+#define IBSQLMonitor_StrPrepare 64557
+#define IBSQLMonitor_StrPlan 64558
+#define IBSQLMonitor_StrPlanCantRetrive 64559
+#define IBXConst_SOptionNeedsClient 64560
+#define IBXConst_SOptionNeedsServer 64561
+#define IBXConst_SInvalidOption 64562
+#define IBXConst_SInvalidOnErrorResult 64563
+#define IBXConst_SInvalidOnStatusResult 64564
+#define IBXConst_SDPBConstantUnknownEx 64565
+#define IBXConst_STPBConstantUnknownEx 64566
+#define IBXConst_SUnknownPlan 64567
+#define IBXConst_SFieldSizeMismatch 64568
+#define IBXConst_SEventAlreadyRegistered 64569
+#define IBXConst_SStringTooLarge 64570
+#define IBXConst_SNoTimers 64571
+#define IBXConst_SIB65feature 64572
+#define IBXConst_SLoginPromptFailure 64573
+#define IBXConst_SIB70feature 64574
+#define IBXConst_SIB71feature 64575
+#define IBXConst_SQueryParamsError 64576
+#define IBXConst_SStartParamsError 64577
+#define IBXConst_SOutputParsingError 64578
+#define IBXConst_SUseSpecificProcedures 64579
+#define IBXConst_SSQLMonitorAlreadyPresent 64580
+#define IBXConst_SCantPrintValue 64581
+#define IBXConst_SEOFReached 64582
+#define IBXConst_SEOFInComment 64583
+#define IBXConst_SEOFInString 64584
+#define IBXConst_SParamNameExpected 64585
+#define IBXConst_SSuccess 64586
+#define IBXConst_SDelphiException 64587
+#define IBXConst_SNoOptionsSet 64588
+#define IBXConst_SNoDestinationDirectory 64589
+#define IBXConst_SNosourceDirectory 64590
+#define IBXConst_SNoUninstallFile 64591
+#define IBXConst_SCannotDropSystemIndex 64592
+#define IBXConst_STableNameMismatch 64593
+#define IBXConst_SIndexFieldMissing 64594
+#define IBXConst_SInvalidCancellation 64595
+#define IBXConst_SInvalidEvent 64596
+#define IBXConst_SMaximumEvents 64597
+#define IBXConst_SNoEventsRegistered 64598
+#define IBXConst_SInvalidQueueing 64599
+#define IBXConst_SInvalidRegistration 64600
+#define IBXConst_SInvalidBatchMove 64601
+#define IBXConst_SSQLDialectInvalid 64602
+#define IBXConst_SSPBConstantNotSupported 64603
+#define IBXConst_SSPBConstantUnknown 64604
+#define IBXConst_SServiceActive 64605
+#define IBXConst_SServiceInActive 64606
+#define IBXConst_SServerNameMissing 64607
+#define IBXConst_SColumnTypesDontMatch 64608
+#define IBXConst_SCantEndSharedTransaction 64609
+#define IBXConst_SFieldUnsupportedType 64610
+#define IBXConst_SCircularDataLink 64611
+#define IBXConst_SEmptySQLStatement 64612
+#define IBXConst_SIsASelectStatement 64613
+#define IBXConst_SRequiredParamNotSet 64614
+#define IBXConst_SNoStoredProcName 64615
+#define IBXConst_SIsAExecuteProcedure 64616
+#define IBXConst_SUpdateFailed 64617
+#define IBXConst_SNotCachedUpdates 64618
+#define IBXConst_SNotLiveRequest 64619
+#define IBXConst_SNoProvider 64620
+#define IBXConst_SNoRecordsAffected 64621
+#define IBXConst_SNoTableName 64622
+#define IBXConst_SCannotCreatePrimaryIndex 64623
+#define IBXConst_SFieldReadOnly 64624
+#define IBXConst_SFieldNotFound 64625
+#define IBXConst_SNotEditing 64626
+#define IBXConst_SCannotInsert 64627
+#define IBXConst_SCannotPost 64628
+#define IBXConst_SCannotUpdate 64629
+#define IBXConst_SCannotDelete 64630
+#define IBXConst_SCannotRefresh 64631
+#define IBXConst_SBufferNotSet 64632
+#define IBXConst_SCircularReference 64633
+#define IBXConst_SSQLParseError 64634
+#define IBXConst_SUserAbort 64635
+#define IBXConst_SDataSetUniDirectional 64636
+#define IBXConst_SCannotCreateSharedResource 64637
+#define IBXConst_SWindowsAPIError 64638
+#define IBXConst_SColumnListsDontMatch 64639
+#define IBXConst_SBOF 64640
+#define IBXConst_SInvalidStatementHandle 64641
+#define IBXConst_SSQLOpen 64642
+#define IBXConst_SSQLClosed 64643
+#define IBXConst_SDatasetOpen 64644
+#define IBXConst_SDatasetClosed 64645
+#define IBXConst_SUnknownSQLDataType 64646
+#define IBXConst_SInvalidColumnIndex 64647
+#define IBXConst_SInvalidParamColumnIndex 64648
+#define IBXConst_SInvalidDataConversion 64649
+#define IBXConst_SColumnIsNotNullable 64650
+#define IBXConst_SBlobCannotBeRead 64651
+#define IBXConst_SBlobCannotBeWritten 64652
+#define IBXConst_SEmptyQuery 64653
+#define IBXConst_SCannotOpenNonSQLSelect 64654
+#define IBXConst_SNoFieldAccess 64655
+#define IBXConst_STPBConstantNotSupported 64656
+#define IBXConst_STPBConstantUnknown 64657
+#define IBXConst_SDatabaseClosed 64658
+#define IBXConst_SDatabaseOpen 64659
+#define IBXConst_SDatabaseNameMissing 64660
+#define IBXConst_SNotInTransaction 64661
+#define IBXConst_SInTransaction 64662
+#define IBXConst_STimeoutNegative 64663
+#define IBXConst_SNoDatabasesInTransaction 64664
+#define IBXConst_SUpdateWrongDB 64665
+#define IBXConst_SUpdateWrongTR 64666
+#define IBXConst_SDatabaseNotAssigned 64667
+#define IBXConst_STransactionNotAssigned 64668
+#define IBXConst_SXSQLDAIndexOutOfRange 64669
+#define IBXConst_SXSQLDANameDoesNotExist 64670
+#define IBXConst_SEOF 64671
 #define uDARes_err_DatasetNotAccessible 64672
 #define uDARes_err_CommandNotAccessible 64673
 #define uDARes_err_SQLNotPermitted 64674
-#define IBSQLMonitor_StrConnect 64675
-#define IBSQLMonitor_StrDisconnect 64676
-#define IBSQLMonitor_StrMisc 64677
-#define IBSQLMonitor_StrError 64678
-#define IBSQLMonitor_StrAttach 64679
-#define IBSQLMonitor_StrDetach 64680
-#define IBSQLMonitor_StrQuery 64681
-#define IBSQLMonitor_StrStart 64682
-#define IBSQLMonitor_StrExecute 64683
-#define IBSQLMonitor_StrNULL 64684
-#define IBSQLMonitor_StrBLOB 64685
-#define IBSQLMonitor_StrFetch 64686
-#define IBSQLMonitor_StrPrepare 64687
+#define IBXConst_SUnknownError 64675
+#define IBXConst_SInterBaseMissing 64676
+#define IBXConst_SInterBaseInstallMissing 64677
+#define IBXConst_SIB60feature 64678
+#define IBXConst_SNotSupported 64679
+#define IBXConst_SNotPermitted 64680
+#define IBXConst_SFileAccessError 64681
+#define IBXConst_SConnectionTimeout 64682
+#define IBXConst_SCannotSetDatabase 64683
+#define IBXConst_SCannotSetTransaction 64684
+#define IBXConst_SOperationCancelled 64685
+#define IBXConst_SDPBConstantNotSupported 64686
+#define IBXConst_SDPBConstantUnknown 64687
 #define uDARes_err_FieldIsNotBound 64688
 #define uDARes_err_CannotFindField 64689
 #define uDARes_err_LoadPackageFailed 64690
@@ -876,10 +876,10 @@
 #define JclResources_RsHKPDLong 64941
 #define JclResources_RsHKCCLong 64942
 #define JclResources_RsHKDDLong 64943
-#define IdResourceStringsProtocols_RSHTTPErrorParsingCommand 64944
-#define IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme 64945
-#define IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive 64946
-#define IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered 64947
+#define IdResourceStringsCore_RSReplyInvalidCode 64944
+#define IdResourceStringsCore_RSThreadSchedulerThreadRequired 64945
+#define IdResourceStringsCore_RSNoOnExecute 64946
+#define IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive 64947
 #define ComStrs_sTabFailClear 64948
 #define ComStrs_sTabFailDelete 64949
 #define ComStrs_sTabFailRetrieve 64950
@@ -892,86 +892,86 @@
 #define ComStrs_sUDAssociated 64957
 #define ComStrs_sPageIndexError 64958
 #define JConsts_sChangeJPGSize 64959
-#define IdResourceStringsProtocols_RSHTTPRequestTimeout 64960
-#define IdResourceStringsProtocols_RSHTTPConflict 64961
-#define IdResourceStringsProtocols_RSHTTPGone 64962
-#define IdResourceStringsProtocols_RSHTTPLengthRequired 64963
-#define IdResourceStringsProtocols_RSHTTPPreconditionFailed 64964
-#define IdResourceStringsProtocols_RSHTTPRequestEntityToLong 64965
-#define IdResourceStringsProtocols_RSHTTPRequestURITooLong 64966
-#define IdResourceStringsProtocols_RSHTTPUnsupportedMediaType 64967
-#define IdResourceStringsProtocols_RSHTTPInternalServerError 64968
-#define IdResourceStringsProtocols_RSHTTPNotImplemented 64969
-#define IdResourceStringsProtocols_RSHTTPBadGateway 64970
-#define IdResourceStringsProtocols_RSHTTPServiceUnavailable 64971
-#define IdResourceStringsProtocols_RSHTTPGatewayTimeout 64972
-#define IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported 64973
-#define IdResourceStringsProtocols_RSHTTPUnknownResponseCode 64974
-#define IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten 64975
-#define IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation 64976
-#define IdResourceStringsProtocols_RSHTTPNoContent 64977
-#define IdResourceStringsProtocols_RSHTTPResetContent 64978
-#define IdResourceStringsProtocols_RSHTTPPartialContent 64979
-#define IdResourceStringsProtocols_RSHTTPMovedPermanently 64980
-#define IdResourceStringsProtocols_RSHTTPMovedTemporarily 64981
-#define IdResourceStringsProtocols_RSHTTPSeeOther 64982
-#define IdResourceStringsProtocols_RSHTTPNotModified 64983
-#define IdResourceStringsProtocols_RSHTTPUseProxy 64984
-#define IdResourceStringsProtocols_RSHTTPBadRequest 64985
-#define IdResourceStringsProtocols_RSHTTPUnauthorized 64986
-#define IdResourceStringsProtocols_RSHTTPForbidden 64987
-#define IdResourceStringsProtocols_RSHTTPNotFound 64988
-#define IdResourceStringsProtocols_RSHTTPMethodNotAllowed 64989
-#define IdResourceStringsProtocols_RSHTTPNotAcceptable 64990
-#define IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired 64991
-#define IdResourceStringsCore_RSchedMaxThreadEx 64992
-#define IdResourceStringsCore_RSTransparentProxyCannotBind 64993
-#define IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP 64994
-#define IdResourceStringsCore_RSBufferMissingTerminator 64995
-#define IdResourceStringsCore_RSBufferInvalidStartPos 64996
-#define IdResourceStringsCore_RSReplyInvalidCode 64997
-#define IdResourceStringsCore_RSThreadSchedulerThreadRequired 64998
-#define IdResourceStringsCore_RSNoOnExecute 64999
-#define IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive 65000
-#define IdResourceStringsProtocols_RSMIMEExtensionEmpty 65001
-#define IdResourceStringsProtocols_RSMIMEMIMETypeEmpty 65002
-#define IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists 65003
-#define IdResourceStringsProtocols_RSHTTPContinue 65004
-#define IdResourceStringsProtocols_RSHTTPOK 65005
-#define IdResourceStringsProtocols_RSHTTPCreated 65006
-#define IdResourceStringsProtocols_RSHTTPAccepted 65007
-#define IdResourceStringsCore_RSSocksServerTTLExpiredError 65008
-#define IdResourceStringsCore_RSSocksServerCommandError 65009
-#define IdResourceStringsCore_RSSocksServerAddressError 65010
-#define IdResourceStringsCore_RSInterceptCircularLink 65011
-#define IdResourceStringsCore_RSNotEnoughDataInBuffer 65012
-#define IdResourceStringsCore_RSTooMuchDataInBuffer 65013
-#define IdResourceStringsCore_RSFileNotFound 65014
-#define IdResourceStringsCore_RSNotConnected 65015
-#define IdResourceStringsCore_RSObjectTypeNotSupported 65016
-#define IdResourceStringsCore_RSIdNoDataToRead 65017
-#define IdResourceStringsCore_RSReadTimeout 65018
-#define IdResourceStringsCore_RSReadLnMaxLineLengthExceeded 65019
-#define IdResourceStringsCore_RSConnectTimeout 65020
-#define IdResourceStringsCore_RSThreadTerminateAndWaitFor 65021
-#define IdResourceStringsCore_RSAlreadyConnected 65022
-#define IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded 65023
+#define IdResourceStringsCore_RSTooMuchDataInBuffer 64960
+#define IdResourceStringsCore_RSFileNotFound 64961
+#define IdResourceStringsCore_RSNotConnected 64962
+#define IdResourceStringsCore_RSObjectTypeNotSupported 64963
+#define IdResourceStringsCore_RSIdNoDataToRead 64964
+#define IdResourceStringsCore_RSReadTimeout 64965
+#define IdResourceStringsCore_RSReadLnMaxLineLengthExceeded 64966
+#define IdResourceStringsCore_RSConnectTimeout 64967
+#define IdResourceStringsCore_RSThreadTerminateAndWaitFor 64968
+#define IdResourceStringsCore_RSAlreadyConnected 64969
+#define IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded 64970
+#define IdResourceStringsCore_RSchedMaxThreadEx 64971
+#define IdResourceStringsCore_RSTransparentProxyCannotBind 64972
+#define IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP 64973
+#define IdResourceStringsCore_RSBufferMissingTerminator 64974
+#define IdResourceStringsCore_RSBufferInvalidStartPos 64975
+#define IdResourceStringsCore_RSSocksRequestServerFailed 64976
+#define IdResourceStringsCore_RSSocksRequestIdentFailed 64977
+#define IdResourceStringsCore_RSSocksUnknownError 64978
+#define IdResourceStringsCore_RSSocksServerRespondError 64979
+#define IdResourceStringsCore_RSSocksAuthMethodError 64980
+#define IdResourceStringsCore_RSSocksAuthError 64981
+#define IdResourceStringsCore_RSSocksServerGeneralError 64982
+#define IdResourceStringsCore_RSSocksServerPermissionError 64983
+#define IdResourceStringsCore_RSSocksServerNetUnreachableError 64984
+#define IdResourceStringsCore_RSSocksServerHostUnreachableError 64985
+#define IdResourceStringsCore_RSSocksServerConnectionRefusedError 64986
+#define IdResourceStringsCore_RSSocksServerTTLExpiredError 64987
+#define IdResourceStringsCore_RSSocksServerCommandError 64988
+#define IdResourceStringsCore_RSSocksServerAddressError 64989
+#define IdResourceStringsCore_RSInterceptCircularLink 64990
+#define IdResourceStringsCore_RSNotEnoughDataInBuffer 64991
+#define IdResourceStringsProtocols_RSHTTPRequestURITooLong 64992
+#define IdResourceStringsProtocols_RSHTTPUnsupportedMediaType 64993
+#define IdResourceStringsProtocols_RSHTTPInternalServerError 64994
+#define IdResourceStringsProtocols_RSHTTPNotImplemented 64995
+#define IdResourceStringsProtocols_RSHTTPBadGateway 64996
+#define IdResourceStringsProtocols_RSHTTPServiceUnavailable 64997
+#define IdResourceStringsProtocols_RSHTTPGatewayTimeout 64998
+#define IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported 64999
+#define IdResourceStringsProtocols_RSHTTPUnknownResponseCode 65000
+#define IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten 65001
+#define IdResourceStringsProtocols_RSHTTPErrorParsingCommand 65002
+#define IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme 65003
+#define IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive 65004
+#define IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered 65005
+#define IdResourceStringsCore_RSSocksUDPNotSupported 65006
+#define IdResourceStringsCore_RSSocksRequestFailed 65007
+#define IdResourceStringsProtocols_RSHTTPSeeOther 65008
+#define IdResourceStringsProtocols_RSHTTPNotModified 65009
+#define IdResourceStringsProtocols_RSHTTPUseProxy 65010
+#define IdResourceStringsProtocols_RSHTTPBadRequest 65011
+#define IdResourceStringsProtocols_RSHTTPUnauthorized 65012
+#define IdResourceStringsProtocols_RSHTTPForbidden 65013
+#define IdResourceStringsProtocols_RSHTTPNotFound 65014
+#define IdResourceStringsProtocols_RSHTTPMethodNotAllowed 65015
+#define IdResourceStringsProtocols_RSHTTPNotAcceptable 65016
+#define IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired 65017
+#define IdResourceStringsProtocols_RSHTTPRequestTimeout 65018
+#define IdResourceStringsProtocols_RSHTTPConflict 65019
+#define IdResourceStringsProtocols_RSHTTPGone 65020
+#define IdResourceStringsProtocols_RSHTTPLengthRequired 65021
+#define IdResourceStringsProtocols_RSHTTPPreconditionFailed 65022
+#define IdResourceStringsProtocols_RSHTTPRequestEntityToLong 65023
 #define IdResourceStrings_RSNotAllBytesSent 65024
 #define IdResourceStrings_RSPackageSizeTooBig 65025
 #define IdResourceStrings_RSSetSizeExceeded 65026
-#define IdResourceStringsCore_RSSocksUDPNotSupported 65027
-#define IdResourceStringsCore_RSSocksRequestFailed 65028
-#define IdResourceStringsCore_RSSocksRequestServerFailed 65029
-#define IdResourceStringsCore_RSSocksRequestIdentFailed 65030
-#define IdResourceStringsCore_RSSocksUnknownError 65031
-#define IdResourceStringsCore_RSSocksServerRespondError 65032
-#define IdResourceStringsCore_RSSocksAuthMethodError 65033
-#define IdResourceStringsCore_RSSocksAuthError 65034
-#define IdResourceStringsCore_RSSocksServerGeneralError 65035
-#define IdResourceStringsCore_RSSocksServerPermissionError 65036
-#define IdResourceStringsCore_RSSocksServerNetUnreachableError 65037
-#define IdResourceStringsCore_RSSocksServerHostUnreachableError 65038
-#define IdResourceStringsCore_RSSocksServerConnectionRefusedError 65039
+#define IdResourceStringsProtocols_RSMIMEExtensionEmpty 65027
+#define IdResourceStringsProtocols_RSMIMEMIMETypeEmpty 65028
+#define IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists 65029
+#define IdResourceStringsProtocols_RSHTTPContinue 65030
+#define IdResourceStringsProtocols_RSHTTPOK 65031
+#define IdResourceStringsProtocols_RSHTTPCreated 65032
+#define IdResourceStringsProtocols_RSHTTPAccepted 65033
+#define IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation 65034
+#define IdResourceStringsProtocols_RSHTTPNoContent 65035
+#define IdResourceStringsProtocols_RSHTTPResetContent 65036
+#define IdResourceStringsProtocols_RSHTTPPartialContent 65037
+#define IdResourceStringsProtocols_RSHTTPMovedPermanently 65038
+#define IdResourceStringsProtocols_RSHTTPMovedTemporarily 65039
 #define IdResourceStrings_RSStackEHOSTDOWN 65040
 #define IdResourceStrings_RSStackEHOSTUNREACH 65041
 #define IdResourceStrings_RSStackENOTEMPTY 65042
@@ -1100,11 +1100,11 @@
 #define DBConsts_SIndexFieldMissing 65165
 #define DBConsts_SDuplicateIndexName 65166
 #define DBConsts_SNoIndexForFields 65167
-#define uRODECConst_sFMT_MIME64 65168
-#define uRODECConst_sFMT_UU 65169
-#define uRODECConst_sFMT_XX 65170
-#define uRODECConst_sInvalidKeySize 65171
-#define uRODECConst_sNotInitialized 65172
+#define uRORes_err_MessageNotAssigned 65168
+#define ComConst_SOleError 65169
+#define ComConst_SNoMethod 65170
+#define ComConst_SVarNotObject 65171
+#define ComConst_STooManyParams 65172
 #define DBConsts_SInvalidFieldSize 65173
 #define DBConsts_SInvalidFieldKind 65174
 #define DBConsts_SUnknownFieldType 65175
@@ -1116,70 +1116,70 @@
 #define DBConsts_SFieldRangeError 65181
 #define DBConsts_SBcdFieldRangeError 65182
 #define DBConsts_SInvalidIntegerValue 65183
-#define uRORes_err_CannotLoadXMLDocument 65184
-#define uRORes_err_ErrorCreatingMsXmlDoc 65185
-#define uRORes_err_NoXMLParsersAvailable 65186
-#define uRORes_err_IDispatchMarshalingNotSupported 65187
-#define uRORes_err_UnsupportedVariantType 65188
-#define uRORes_err_VariantIsNotArray 65189
-#define uRORes_err_InvalidVarArrayDimCount 65190
-#define uRORes_err_CannotFindParameter 65191
-#define uRORes_err_MessageNotAssigned 65192
-#define uRODECConst_sProtectionCircular 65193
-#define uRODECConst_sStringFormatExists 65194
-#define uRODECConst_sInvalidStringFormat 65195
-#define uRODECConst_sInvalidFormatString 65196
-#define uRODECConst_sFMT_COPY 65197
-#define uRODECConst_sFMT_HEX 65198
-#define uRODECConst_sFMT_HEXL 65199
-#define uRORes_err_UnknownClass 65200
-#define uRORes_err_UnknownProxyInterface 65201
-#define uRORes_err_DispatcherAlreadyAssigned 65202
-#define uRORes_err_CannotFindMessageDispatcher 65203
-#define uRORes_err_ServerOnlySupportsOneDispatcher 65204
-#define uRORes_err_UnhandledException 65205
-#define uRORes_err_ChannelBusy 65206
-#define uRORes_err_ArrayIndexOutOfBounds 65207
-#define uRORes_err_InvalidHeader 65208
-#define uRORes_err_InvalidHeaderEncrypted 65209
-#define uRORes_err_UnknownClassInStream 65210
-#define uRORes_err_UnexpectedClassInStream 65211
-#define uRORes_err_SessionNotFound 65212
-#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65213
-#define uRORes_err_TooManySessions 65214
-#define uRORes_err_DOMElementIsNIL 65215
-#define uRORes_err_RodlStructCannotBeNested 65216
-#define uRORes_err_RodlInvalidAncestorType 65217
-#define uRORes_str_ExceptionOnServer 65218
-#define uRORes_str_ExceptionReraisedFromServer 65219
-#define uRORes_err_AssignError 65220
-#define uRORes_err_InvalidRequestStream 65221
-#define uRORes_err_NILMessage 65222
-#define uRORes_err_UnspecifiedInterface 65223
-#define uRORes_err_UnspecifiedMessage 65224
-#define uRORes_err_UnknownMethod 65225
-#define uRORes_err_ClassFactoryDidNotReturnInstance 65226
-#define uRORes_err_ParameterNotFound 65227
-#define uRORes_err_TypeNotSupported 65228
-#define uRORes_err_ClassFactoryNotFound 65229
-#define uRORes_err_IROMessageNotSupported 65230
-#define uRORes_err_ClassAlreadyRegistered 65231
-#define uRORes_err_InvalidIndex 65232
-#define uRORes_err_InvalidType 65233
-#define uRORes_err_InvalidLibrary 65234
-#define uRORes_err_InvalidStream 65235
-#define uRORes_err_InvalidTargetEntity 65236
-#define uRORes_err_InvalidParamFlag 65237
-#define uRORes_err_InvalidStringLength 65238
-#define uRORes_str_InvalidClassTypeInStream 65239
-#define uRORes_err_UnexpectedEndOfStream 65240
-#define uRORes_err_RodlDuplicateName 65241
-#define uRORes_err_RodlNoDataTypeSpecified 65242
-#define uRORes_err_RodlNoEnumValues 65243
-#define uRORes_err_RodlNoStructElementsDefined 65244
-#define uRORes_err_RodlNoOperationsDefined 65245
-#define uRORes_err_RodlUsedFileDoesNotExist 65246
-#define uRORes_err_RodlInvalidDataType 65247
+#define uRORes_err_InvalidHeader 65184
+#define uRORes_err_InvalidHeaderEncrypted 65185
+#define uRORes_err_UnknownClassInStream 65186
+#define uRORes_err_UnexpectedClassInStream 65187
+#define uRORes_err_SessionNotFound 65188
+#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65189
+#define uRORes_err_TooManySessions 65190
+#define uRORes_err_DOMElementIsNIL 65191
+#define uRORes_err_CannotLoadXMLDocument 65192
+#define uRORes_err_ErrorCreatingMsXmlDoc 65193
+#define uRORes_err_NoXMLParsersAvailable 65194
+#define uRORes_err_IDispatchMarshalingNotSupported 65195
+#define uRORes_err_UnsupportedVariantType 65196
+#define uRORes_err_VariantIsNotArray 65197
+#define uRORes_err_InvalidVarArrayDimCount 65198
+#define uRORes_err_CannotFindParameter 65199
+#define uRORes_err_UnspecifiedMessage 65200
+#define uRORes_err_UnknownMethod 65201
+#define uRORes_err_ClassFactoryDidNotReturnInstance 65202
+#define uRORes_err_ParameterNotFound 65203
+#define uRORes_err_TypeNotSupported 65204
+#define uRORes_err_ClassFactoryNotFound 65205
+#define uRORes_err_IROMessageNotSupported 65206
+#define uRORes_err_ClassAlreadyRegistered 65207
+#define uRORes_err_UnknownClass 65208
+#define uRORes_err_UnknownProxyInterface 65209
+#define uRORes_err_DispatcherAlreadyAssigned 65210
+#define uRORes_err_CannotFindMessageDispatcher 65211
+#define uRORes_err_ServerOnlySupportsOneDispatcher 65212
+#define uRORes_err_UnhandledException 65213
+#define uRORes_err_ChannelBusy 65214
+#define uRORes_err_ArrayIndexOutOfBounds 65215
+#define uRORes_err_UnexpectedEndOfStream 65216
+#define uRORes_err_RodlDuplicateName 65217
+#define uRORes_err_RodlNoDataTypeSpecified 65218
+#define uRORes_err_RodlNoEnumValues 65219
+#define uRORes_err_RodlNoStructElementsDefined 65220
+#define uRORes_err_RodlNoOperationsDefined 65221
+#define uRORes_err_RodlUsedFileDoesNotExist 65222
+#define uRORes_err_RodlInvalidDataType 65223
+#define uRORes_err_RodlStructCannotBeNested 65224
+#define uRORes_err_RodlInvalidAncestorType 65225
+#define uRORes_str_ExceptionOnServer 65226
+#define uRORes_str_ExceptionReraisedFromServer 65227
+#define uRORes_err_AssignError 65228
+#define uRORes_err_InvalidRequestStream 65229
+#define uRORes_err_NILMessage 65230
+#define uRORes_err_UnspecifiedInterface 65231
+#define uRODECConst_sFMT_COPY 65232
+#define uRODECConst_sFMT_HEX 65233
+#define uRODECConst_sFMT_HEXL 65234
+#define uRODECConst_sFMT_MIME64 65235
+#define uRODECConst_sFMT_UU 65236
+#define uRODECConst_sFMT_XX 65237
+#define uRODECConst_sInvalidKeySize 65238
+#define uRODECConst_sNotInitialized 65239
+#define uRORes_err_InvalidIndex 65240
+#define uRORes_err_InvalidType 65241
+#define uRORes_err_InvalidLibrary 65242
+#define uRORes_err_InvalidStream 65243
+#define uRORes_err_InvalidTargetEntity 65244
+#define uRORes_err_InvalidParamFlag 65245
+#define uRORes_err_InvalidStringLength 65246
+#define uRORes_str_InvalidClassTypeInStream 65247
 #define Consts_SErrorSettingCount 65248
 #define Consts_SListBoxMustBeVirtual 65249
 #define Consts_SANSIEncoding 65250
@@ -1192,10 +1192,10 @@
 #define Consts_STrayIconCreateError 65257
 #define Consts_SPageControlNotSet 65258
 #define Consts_SWindowsVistaRequired 65259
-#define ComConst_SOleError 65260
-#define ComConst_SNoMethod 65261
-#define ComConst_SVarNotObject 65262
-#define ComConst_STooManyParams 65263
+#define uRODECConst_sProtectionCircular 65260
+#define uRODECConst_sStringFormatExists 65261
+#define uRODECConst_sInvalidStringFormat 65262
+#define uRODECConst_sInvalidFormatString 65263
 #define Consts_SIconToClipboard 65264
 #define Consts_SCannotOpenClipboard 65265
 #define Consts_SInvalidMemoSize 65266
@@ -1730,86 +1730,9 @@ BEGIN
 	pnglang_EPNGUnexpectedEndText,	"This \"Portable Network Graphics\" image is invalid because the decoder found an unexpected end of the file."
 	pnglang_EPNGNoImageDataText,	"This \"Portable Network Graphics\" image contains no data."
 	pnglang_EPNGCannotChangeSizeText,	"The \"Portable Network Graphics\" image can not be resize by changing width and height properties. Try assigning the image from a bitmap."
-	DBXMetaDataReader_SIsLong,	"Long"
-	DBXMetaDataReader_SPastEndOfCursor,	"No more data."
-	DBXMetaDataReader_SUnexpectedSymbol,	"Could not parse the %1:s metadata command. Problem found near: %0:s. Original query: %2:s."
-	DBXMetaDataReader_SLiteralPrefix,	"Literal Prefix"
-	DBXMetaDataReader_SMinimumScale,	"Minimum Scale"
-	DBXMetaDataReader_SLiteralSuffix,	"Literal Suffix"
-	DBXMetaDataCommand_SBeforeRow,	"Invoke Next before getting data from a reader."
-	DBXMetaDataCommand_SAfterRow,	"No more data in reader."
-	DBXMetaDataCommandFactory_SUnknownDataType,	"Unknown Data Type"
-	DBXDynalink_SAdditionalInfo,	"%s.  Vendor error message:  %s."
-	DBXDynalink_SInvalidDataType,	"dbExpress driver does not support the %s data type"
-	DBXDataStoreMetaDataReader_SCannotLoadMetaDataForJds7,	"MetaData cannot be provided from a BlackfishSQL server older than version 8.0"
-	DBXClient_ParameterNotSet,	"Parameter not set for column number %d"
-	DBXPool_SConnectTimeout,	"Connect request timed out after %s milliseconds"
-	DBXPool_SInvalidCommand,	"Unrecognized command:  %s"
-	DBXTrace_SINVALID_TRACE_FLAG,	"%s is an invalid setting for the %s property.\r\nUse '%s' or a semicolon separated list of one or more of the following:\r\n%s %s %s %s %s %s %s %s %s %s %s %s"
-	DBXMetaDataReader_SIsAutoIncrement,	"Auto Increment"
-	DBXMetaDataReader_SRoleName,	"Role Name"
-	DBXMetaDataReader_SOrdinalOutOfRange,	"Ordinal is outside the bounds of this cursor."
-	DBXMetaDataReader_SIsUnique,	"Unique"
-	DBXMetaDataReader_SCreateFormat,	"Create Format"
-	DBXMetaDataReader_SPrimaryKeyName,	"Primary Key Name"
-	DBXMetaDataReader_SUnknownTableType,	"Unknown table type specified:"
-	DBXMetaDataReader_SColumnSize,	"Column Size"
-	DBXMetaDataReader_SPrimaryColumnName,	"Primary Column Name"
-	DBXMetaDataReader_SIsAutoIncrementable,	"AutoIncrementable"
-	DBXMetaDataReader_SProcedureName,	"Procedure Name"
-	DBXMetaDataReader_STableCatalogName,	"Table Catalog Name"
-	DBXMetaDataReader_SReservedWord,	"Reserved Word"
-	DBXMetaDataReader_STableSchemaName,	"Table Schema Name"
-	DBXMetaDataReader_STypeName,	"Type Name"
-	DBXMetaDataReader_SViewName,	"View Name"
-	DBXMetaDataReader_SIsLiteralSupported,	"Literal Supported"
-	DBXMetaDataReader_SIsAscending,	"Ascending"
-	DBXMetaDataReader_SIsUnicode,	"Unicode"
-	DBXMetaDataReader_SPrecision,	"Precision"
-	DBXMetaDataReader_SConstraintName,	"Constraint Name"
-	DBXMetaDataReader_SMustCallNextFirst,	"Cursor is positioned before the first row, move to the next row before getting data"
-	DBXMetaDataReader_SScale,	"Scale"
-	DBXMetaDataReader_SIsNullable,	"Nullable"
-	DBXMetaDataReader_SWrongAccessorForType,	"Wrong accessor method used for the datatype: %s."
-	DBXMetaDataReader_SExternalDefinition,	"External Definition"
-	DBXMetaDataReader_SForeignKeyName,	"Foreign Key Name"
-	DBXMetaDataReader_SIsSearchable,	"Searchable"
-	DBXMetaDataReader_SPrimarySchemaName,	"Primary Schema Name"
-	DBXMetaDataReader_SIsCaseSensitive,	"Case Sensitive"
-	DBXMetaDataReader_SParameterName,	"Parameter Name"
-	DBXMetaDataReader_SIsUnsigned,	"Unsigned"
-	DBXMetaDataReader_SCatalogName,	"Catalog Name"
-	DBXMetaDataReader_SIsBestMatch,	"Best Match"
-	DBXMetaDataReader_SMaximumScale,	"Maximum Scale"
-	DBXMetaDataReader_SOrdinal,	"Ordinal"
-	DBXMetaDataReader_SMaximumVersion,	"Maximum Version"
-	DBXMetaDataReader_SDefaultValue,	"Default Value"
-	DBXMetaDataReader_SPrimaryTableName,	"Primary Table Name"
-	DBXMetaDataReader_SMinimumVersion,	"Minimum Version"
-	DBXMetaDataReader_SDefinition,	"Definition"
-	DBXMetaDataReader_SColumnName,	"Column Name"
-	DBXMetaDataReader_SCreateParameters,	"Create Parameters"
-	DBXMetaDataReader_SIsConcurrencyType,	"Concurrency"
-	DBXMetaDataReader_SDbxDataType,	"DbxType"
-	DBXMetaDataReader_STableType,	"Table Type"
-	DBXMetaDataReader_SMaxInline,	"Max Inline"
-	DBXMetaDataReader_SUnclosedQuotes,	"Unclosed quotes were found in the metadata query: %s."
-	DBXMetaDataReader_SDataType,	"Platform Type Name"
-	DBXMetaDataReader_STableName,	"Table Name"
-	DBXMetaDataReader_SPackageName,	"Package Name"
-	DBXMetaDataReader_SIsSearchableWithLike,	"Searchable With Like"
-	DBXMetaDataReader_SPrimaryCatalogName,	"Primary Catalog Name"
-	DBXMetaDataReader_SIsPrimary,	"Primary"
-	DBXMetaDataReader_SSchemaName,	"Schema Name"
-	DBXMetaDataReader_SProviderDbType,	"Provider Type"
-	DBXMetaDataReader_SSynonymName,	"Synonym Name"
-	DBXMetaDataReader_SProcedureType,	"Procedure Type"
-	DBXMetaDataReader_SParameterMode,	"Parameter Mode"
-	DBXMetaDataReader_SMetaDataCommandExpected,	"A MetaData command was expected here e.g. GetTables."
-	DBXMetaDataReader_SMissingImplementation,	"This method must be implemented in a derived class."
-	DBXMetaDataReader_SIsFixedLength,	"Fixed Length"
-	DBXMetaDataReader_SIsFixedPrecisionScale,	"Fixed Precision"
-	DBXMetaDataReader_SUserName,	"User Name"
+	SqlConst_SDUPLICATETXNID,	"[0x0011]: Duplicate Transaction ID"
+	SqlConst_SDRIVERRESTRICTED,	"[0x0012]: Application is not licensed to use this feature"
+	SqlConst_SLOCALTRANSACTIVE,	"[0x0013]: Local Transaction already active"
 	SqlConst_SMULTIPLETRANSNOTENABLED,	"[0x0014]: Multiple Transactions not Enabled"
 	SqlConst_SCONNECTIONFAILED,	"[0x0015]: Connection failed"
 	SqlConst_SDRIVERINITFAILED,	"[0x0016]: Driver initialization failed"
@@ -1823,9 +1746,9 @@ BEGIN
 	SqlConst_SObjectTypenameRequired,	"Object type name required as parameter value"
 	SqlConst_SCannotCreateFile,	"Cannot create file %s"
 	SqlConst_SUnknownDataType,	"Unknown data type:  %s for %s parameter"
-	DBXPlatformUtil_SIllegalArgument,	"Illegal argument"
-	DBXPlatformUtil_SUnsupportedOperation,	"Unsupported operation"
-	DBXMetaDataReader_SIndexName,	"Index Name"
+	SqlConst_SWARNING,	"[0x0001]: Warning"
+	SqlConst_SNOMEMORY,	"[0x0002]: Insufficient Memory for Operation"
+	SqlConst_SINVALIDFLDTYPE,	"[0x0003]: Invalid Field Type"
 	SqlConst_SINVALIDHNDL,	"[0x0004]: Invalid Handle"
 	SqlConst_SNOTSUPPORTED,	"[0x0005]: Operation Not Supported"
 	SqlConst_SINVALIDTIME,	"[0x0006]: Invalid Time"
@@ -1839,9 +1762,9 @@ BEGIN
 	SqlConst_SINVALIDLEN,	"[0x000E]: Invalid Length"
 	SqlConst_SINVALIDXISOLEVEL,	"[0x000F]: Invalid Transaction Isolation Level"
 	SqlConst_SINVALIDTXNID,	"[0x0010]: Invalid Transaction ID"
-	SqlConst_SDUPLICATETXNID,	"[0x0011]: Duplicate Transaction ID"
-	SqlConst_SDRIVERRESTRICTED,	"[0x0012]: Application is not licensed to use this feature"
-	SqlConst_SLOCALTRANSACTIVE,	"[0x0013]: Local Transaction already active"
+	SqlConst_SEmptySQLStatement,	"No SQL statement available"
+	SqlConst_SNoParameterValue,	"No value for parameter '%s'"
+	SqlConst_SNoSqlStatement,	"Missing query, table name or procedure name"
 	SqlConst_SMissingDataBaseName,	"Missing Database property"
 	SqlConst_SMissingDriverName,	"Missing DriverName property"
 	SqlConst_SPrepareError,	"Unable to execute Query"
@@ -1855,9 +1778,88 @@ BEGIN
 	SqlConst_SStoredProcsNotSupported,	"Stored Procedures not supported by '%s' Server"
 	SqlConst_SPackagesNotSupported,	"Packages are not supported by '%s' Server"
 	SqlConst_SNOERROR,	""
-	SqlConst_SWARNING,	"[0x0001]: Warning"
-	SqlConst_SNOMEMORY,	"[0x0002]: Insufficient Memory for Operation"
-	SqlConst_SINVALIDFLDTYPE,	"[0x0003]: Invalid Field Type"
+	DBXMetaDataCommand_SBeforeRow,	"Invoke Next before getting data from a reader."
+	DBXMetaDataCommand_SAfterRow,	"No more data in reader."
+	DBXMetaDataCommandFactory_SUnknownDataType,	"Unknown Data Type"
+	DBXDynalink_SAdditionalInfo,	"%s.  Vendor error message:  %s."
+	DBXDynalink_SInvalidDataType,	"dbExpress driver does not support the %s data type"
+	DBXDataStoreMetaDataReader_SCannotLoadMetaDataForJds7,	"MetaData cannot be provided from a BlackfishSQL server older than version 8.0"
+	DBXClient_ParameterNotSet,	"Parameter not set for column number %d"
+	DBXPool_SConnectTimeout,	"Connect request timed out after %s milliseconds"
+	DBXPool_SInvalidCommand,	"Unrecognized command:  %s"
+	DBXTrace_SINVALID_TRACE_FLAG,	"%s is an invalid setting for the %s property.\r\nUse '%s' or a semicolon separated list of one or more of the following:\r\n%s %s %s %s %s %s %s %s %s %s %s %s"
+	SqlConst_SLoginError,	"Cannot connect to database '%s'"
+	SqlConst_SMonitorActive,	"Cannot change connection on Active Monitor"
+	SqlConst_SDatabaseOpen,	"Cannot perform this operation on an open connection"
+	SqlConst_SDatabaseClosed,	"Cannot perform this operation on a closed connection"
+	SqlConst_SMissingSQLConnection,	"SQLConnection property required for this operation"
+	SqlConst_SConnectionNameMissing,	"Connection name missing"
+	DBXMetaDataReader_SUnknownTableType,	"Unknown table type specified:"
+	DBXMetaDataReader_SColumnSize,	"Column Size"
+	DBXMetaDataReader_SPrimaryColumnName,	"Primary Column Name"
+	DBXMetaDataReader_SIsAutoIncrementable,	"AutoIncrementable"
+	DBXMetaDataReader_SProcedureName,	"Procedure Name"
+	DBXMetaDataReader_STableCatalogName,	"Table Catalog Name"
+	DBXMetaDataReader_SReservedWord,	"Reserved Word"
+	DBXMetaDataReader_STableSchemaName,	"Table Schema Name"
+	DBXMetaDataReader_STypeName,	"Type Name"
+	DBXMetaDataReader_SViewName,	"View Name"
+	DBXMetaDataReader_SIsLong,	"Long"
+	DBXMetaDataReader_SPastEndOfCursor,	"No more data."
+	DBXMetaDataReader_SUnexpectedSymbol,	"Could not parse the %1:s metadata command. Problem found near: %0:s. Original query: %2:s."
+	DBXMetaDataReader_SLiteralPrefix,	"Literal Prefix"
+	DBXMetaDataReader_SMinimumScale,	"Minimum Scale"
+	DBXMetaDataReader_SLiteralSuffix,	"Literal Suffix"
+	DBXMetaDataReader_SScale,	"Scale"
+	DBXMetaDataReader_SIsNullable,	"Nullable"
+	DBXMetaDataReader_SWrongAccessorForType,	"Wrong accessor method used for the datatype: %s."
+	DBXMetaDataReader_SExternalDefinition,	"External Definition"
+	DBXMetaDataReader_SForeignKeyName,	"Foreign Key Name"
+	DBXMetaDataReader_SIsSearchable,	"Searchable"
+	DBXMetaDataReader_SPrimarySchemaName,	"Primary Schema Name"
+	DBXMetaDataReader_SIsCaseSensitive,	"Case Sensitive"
+	DBXMetaDataReader_SParameterName,	"Parameter Name"
+	DBXMetaDataReader_SIsUnsigned,	"Unsigned"
+	DBXMetaDataReader_SIsAutoIncrement,	"Auto Increment"
+	DBXMetaDataReader_SRoleName,	"Role Name"
+	DBXMetaDataReader_SOrdinalOutOfRange,	"Ordinal is outside the bounds of this cursor."
+	DBXMetaDataReader_SIsUnique,	"Unique"
+	DBXMetaDataReader_SCreateFormat,	"Create Format"
+	DBXMetaDataReader_SPrimaryKeyName,	"Primary Key Name"
+	DBXMetaDataReader_SPrimaryTableName,	"Primary Table Name"
+	DBXMetaDataReader_SMinimumVersion,	"Minimum Version"
+	DBXMetaDataReader_SDefinition,	"Definition"
+	DBXMetaDataReader_SColumnName,	"Column Name"
+	DBXMetaDataReader_SCreateParameters,	"Create Parameters"
+	DBXMetaDataReader_SIsConcurrencyType,	"Concurrency"
+	DBXMetaDataReader_SDbxDataType,	"DbxType"
+	DBXMetaDataReader_STableType,	"Table Type"
+	DBXMetaDataReader_SMaxInline,	"Max Inline"
+	DBXMetaDataReader_SUnclosedQuotes,	"Unclosed quotes were found in the metadata query: %s."
+	DBXMetaDataReader_SIsLiteralSupported,	"Literal Supported"
+	DBXMetaDataReader_SIsAscending,	"Ascending"
+	DBXMetaDataReader_SIsUnicode,	"Unicode"
+	DBXMetaDataReader_SPrecision,	"Precision"
+	DBXMetaDataReader_SConstraintName,	"Constraint Name"
+	DBXMetaDataReader_SMustCallNextFirst,	"Cursor is positioned before the first row, move to the next row before getting data"
+	DBXMetaDataReader_SSchemaName,	"Schema Name"
+	DBXMetaDataReader_SProviderDbType,	"Provider Type"
+	DBXMetaDataReader_SSynonymName,	"Synonym Name"
+	DBXMetaDataReader_SProcedureType,	"Procedure Type"
+	DBXMetaDataReader_SParameterMode,	"Parameter Mode"
+	DBXMetaDataReader_SMetaDataCommandExpected,	"A MetaData command was expected here e.g. GetTables."
+	DBXMetaDataReader_SMissingImplementation,	"This method must be implemented in a derived class."
+	DBXMetaDataReader_SIsFixedLength,	"Fixed Length"
+	DBXMetaDataReader_SIsFixedPrecisionScale,	"Fixed Precision"
+	DBXMetaDataReader_SUserName,	"User Name"
+	DBXMetaDataReader_SCatalogName,	"Catalog Name"
+	DBXMetaDataReader_SIsBestMatch,	"Best Match"
+	DBXMetaDataReader_SMaximumScale,	"Maximum Scale"
+	DBXMetaDataReader_SOrdinal,	"Ordinal"
+	DBXMetaDataReader_SMaximumVersion,	"Maximum Version"
+	DBXMetaDataReader_SDefaultValue,	"Default Value"
+	DBXCommon_SReaderClosed,	"Reader has no more rows"
+	DBXCommon_SReadOnlyType,	"%s type cannot be modified"
 	DBXCommon_SConnectionFactoryInitFailed,	"Cannot find connection files from application directory (%s) or the system registry (%s)."
 	DBXCommon_SInvalidDelegationDepth,	"Cannot delegate a connection more than 16 times:  %s"
 	DBXCommon_SInvalidOrdinal,	"Invalid Ordinal:  %d"
@@ -1865,16 +1867,16 @@ BEGIN
 	DBXCommon_SAlreadyPrepared,	"Command can only be prepared once"
 	DBXCommon_SInvalidTypeAccess,	"%s value type cannot be accessed as %s value type"
 	DBXCommon_SNoStatementToExecute,	"No statement to execute"
-	SqlConst_SLoginError,	"Cannot connect to database '%s'"
-	SqlConst_SMonitorActive,	"Cannot change connection on Active Monitor"
-	SqlConst_SDatabaseOpen,	"Cannot perform this operation on an open connection"
-	SqlConst_SDatabaseClosed,	"Cannot perform this operation on a closed connection"
-	SqlConst_SMissingSQLConnection,	"SQLConnection property required for this operation"
-	SqlConst_SConnectionNameMissing,	"Connection name missing"
-	SqlConst_SEmptySQLStatement,	"No SQL statement available"
-	SqlConst_SNoParameterValue,	"No value for parameter '%s'"
-	SqlConst_SNoSqlStatement,	"Missing query, table name or procedure name"
+	DBXMetaDataReader_SIndexName,	"Index Name"
+	DBXMetaDataReader_SDataType,	"Platform Type Name"
+	DBXMetaDataReader_STableName,	"Table Name"
+	DBXMetaDataReader_SPackageName,	"Package Name"
+	DBXMetaDataReader_SIsSearchableWithLike,	"Searchable With Like"
+	DBXMetaDataReader_SPrimaryCatalogName,	"Primary Catalog Name"
+	DBXMetaDataReader_SIsPrimary,	"Primary"
 	bdeconst_SLocalTransDirty,	"The transaction isolation level must be dirty read for local databases"
+	DBXPlatformUtil_SIllegalArgument,	"Illegal argument"
+	DBXPlatformUtil_SUnsupportedOperation,	"Unsupported operation"
 	ClassRegistry_SAlreadyRegistered,	"%s class already registered"
 	ClassRegistry_SNotRegistered,	"%s class is not registered"
 	ClassRegistry_SInvalidClassRegister,	"%s class registered with a nil class reference"
@@ -1888,8 +1890,6 @@ BEGIN
 	DBXCommon_SRequiredProperty,	"%s property not set"
 	DBXCommon_SDriverLoadError,	"%s driver cannot be loaded.  Make sure your project either uses the %s unit or uses packages so the %s package can be loaded dynamically"
 	DBXCommon_SReaderNew,	"Reader Next method has not been called"
-	DBXCommon_SReaderClosed,	"Reader has no more rows"
-	DBXCommon_SReadOnlyType,	"%s type cannot be modified"
 	bdeconst_SHandleError,	"Error creating cursor handle"
 	bdeconst_SNoReferenceTableName,	"ReferenceTableName not specified for field '%s'"
 	bdeconst_SEmptySQLStatement,	"No SQL statement available"
@@ -1922,12 +1922,12 @@ BEGIN
 	bdeconst_SDatabaseClosed,	"Cannot perform this operation on a closed database"
 	bdeconst_SDatabaseHandleSet,	"Database handle owned by a different session"
 	bdeconst_SSessionActive,	"Cannot perform this operation on an active session"
-	IBXConst_SNoTimers,	"Not enough timers available"
-	IBXConst_SIB65feature,	"%s is an InterBase 6.5 function. Please upgrade to InterBase 6.5 to use this functonality"
-	IBXConst_SLoginPromptFailure,	"Can not find default login prompt dialog.  Please add DBLogDlg to the uses section of your main file."
-	IBXConst_SIB70feature,	"%s is an InterBase 7.0 function. Please upgrade to InterBase 7.0 to use this functonality"
-	IBXConst_SIB71feature,	"%s is an InterBase 7.1 function. Please upgrade to InterBase 7.1 to use this functonality"
-	IBXConst_SIB80feature,	"%s is an InterBase 2007 function. Please upgrade to InterBase 2007 to use this functonality"
+	IBSQLMonitor_StrCommitHardComm,	": [Commit (Hard commit)]"
+	IBSQLMonitor_StrCommitRetaining,	": [Commit retaining (Soft commit)]"
+	IBSQLMonitor_StrRollback,	": [Rollback]"
+	IBSQLMonitor_StrRollbackRetainin,	": [Rollback retaining (Soft rollback)]"
+	IBSQLMonitor_StrStartTransaction,	": [Start transaction]"
+	IBSQLMonitor_StrApplication,	"[Application: "
 	ADOConst_SMissingConnection,	"Missing Connection or ConnectionString"
 	ADOConst_SNoDetailFilter,	"Filter property cannot be used for detail tables"
 	ADOConst_SBookmarksRequired,	"Dataset does not support bookmarks, which are required for multi-record data controls"
@@ -1938,137 +1938,7 @@ BEGIN
 	ADOConst_SUsupportedFieldType,	"Unsupported field type (%s) in field %s"
 	ADOConst_SConnectionRequired,	"A connection component is required for async ExecuteOptions"
 	ADOConst_SCantRequery,	"Cannot perform a requery after connection has changed"
-	IBXConst_SDelphiException,	"DelphiException %s"
-	IBXConst_SNoOptionsSet,	"No Install Options selected"
-	IBXConst_SNoDestinationDirectory,	"DestinationDirectory is not set"
-	IBXConst_SNosourceDirectory,	"SourceDirectory is not set"
-	IBXConst_SNoUninstallFile,	"Uninstall File Name is not set"
-	IBXConst_SOptionNeedsClient,	"%s component requires Client to function properly"
-	IBXConst_SOptionNeedsServer,	"%s component requires Server to function properly"
-	IBXConst_SInvalidOption,	"Invalid option specified"
-	IBXConst_SInvalidOnErrorResult,	"Unexpected onError return value"
-	IBXConst_SInvalidOnStatusResult,	"Unexpected onStatus return value"
-	IBXConst_SDPBConstantUnknownEx,	"DPB Constant (%s) is unknown"
-	IBXConst_STPBConstantUnknownEx,	"TPB Constant (%s) is unknown"
-	IBXConst_SUnknownPlan,	"Unknown Error - Can't retrieve plan"
-	IBXConst_SFieldSizeMismatch,	"Size Mismatch - Field %s size is too small for data"
-	IBXConst_SEventAlreadyRegistered,	"Events already registered"
-	IBXConst_SStringTooLarge,	"Trying to store a string of length %d into a field that can only contain %d"
-	IBXConst_SSPBConstantNotSupported,	"SPB Constant Not supported"
-	IBXConst_SSPBConstantUnknown,	"SPB Constant Unknown"
-	IBXConst_SServiceActive,	"Cannot perform operation -- service is not attached"
-	IBXConst_SServiceInActive,	"Cannot perform operation -- service is attached"
-	IBXConst_SServerNameMissing,	"Server Name Missing"
-	IBXConst_SQueryParamsError,	"Query Parameters missing or incorrect"
-	IBXConst_SStartParamsError,	"start Parameters missing or incorrect"
-	IBXConst_SOutputParsingError,	"Unexpected Output buffer value"
-	IBXConst_SUseSpecificProcedures,	"Generic ServiceStart not applicable: Use Specific Procedures to set configuration params"
-	IBXConst_SSQLMonitorAlreadyPresent,	"SQL Monitor Instance is already present"
-	IBXConst_SCantPrintValue,	"Cannot print value"
-	IBXConst_SEOFReached,	"SEOFReached"
-	IBXConst_SEOFInComment,	"EOF in comment detected"
-	IBXConst_SEOFInString,	"EOF in string detected"
-	IBXConst_SParamNameExpected,	"Parameter name expected"
-	IBXConst_SSuccess,	"Successful execution"
-	IBXConst_SNotLiveRequest,	"Request is not live - cannot modify"
-	IBXConst_SNoProvider,	"No Provider"
-	IBXConst_SNoRecordsAffected,	"No Records Affected"
-	IBXConst_SNoTableName,	"No Table Name assigned"
-	IBXConst_SCannotCreatePrimaryIndex,	"Cannot Create Primary Index; are created automatically"
-	IBXConst_SCannotDropSystemIndex,	"Cannot Drop System Index"
-	IBXConst_STableNameMismatch,	"Table Name Mismatch"
-	IBXConst_SIndexFieldMissing,	"Index Field Missing"
-	IBXConst_SInvalidCancellation,	"Cannot Cancel events while processing"
-	IBXConst_SInvalidEvent,	"Invalid Event"
-	IBXConst_SMaximumEvents,	"Exceded Maximum Event limits"
-	IBXConst_SNoEventsRegistered,	"No Events Registered"
-	IBXConst_SInvalidQueueing,	"Invalid Queueing"
-	IBXConst_SInvalidRegistration,	"Invalid Registration"
-	IBXConst_SInvalidBatchMove,	"Invalid Batch Move"
-	IBXConst_SSQLDialectInvalid,	"SQL Dialect Invalid"
-	IBXConst_SUserAbort,	"User abort"
-	IBXConst_SDataSetUniDirectional,	"Data set is uni-directional"
-	IBXConst_SCannotCreateSharedResource,	"Cannot create shared resource. (Windows error %d)"
-	IBXConst_SWindowsAPIError,	"Windows API error. (Windows error %d [$%.8x])"
-	IBXConst_SColumnListsDontMatch,	"Column lists do not match"
-	IBXConst_SColumnTypesDontMatch,	"Column types don't match. (From index: %d; To index: %d)"
-	IBXConst_SCantEndSharedTransaction,	"Can't end a shared transaction unless it is forced and equal to the transaction's TimeoutAction"
-	IBXConst_SFieldUnsupportedType,	"Unsupported Field Type"
-	IBXConst_SCircularDataLink,	"Circular DataLink Reference"
-	IBXConst_SEmptySQLStatement,	"Empty SQL Statement"
-	IBXConst_SIsASelectStatement,	"use Open for a Select Statement"
-	IBXConst_SRequiredParamNotSet,	"Required Param value not set"
-	IBXConst_SNoStoredProcName,	"No Stored Procedure Name assigned"
-	IBXConst_SIsAExecuteProcedure,	"use ExecProc for Procedure; use TQuery for Select procedures"
-	IBXConst_SUpdateFailed,	"Update Failed"
-	IBXConst_SNotCachedUpdates,	"CachedUpdates not enabled"
-	IBXConst_SBlobCannotBeRead,	"Blob stream cannot be read"
-	IBXConst_SBlobCannotBeWritten,	"Blob stream cannot be written"
-	IBXConst_SEmptyQuery,	"Empty query"
-	IBXConst_SCannotOpenNonSQLSelect,	"Cannot \"open\" a non-select statement. Use ExecQuery"
-	IBXConst_SNoFieldAccess,	"No access to field \"%s\""
-	IBXConst_SFieldReadOnly,	"Field \"%s\" is read-only"
-	IBXConst_SFieldNotFound,	"Field \"%s\" not found"
-	IBXConst_SNotEditing,	"Not in edit mode"
-	IBXConst_SCannotInsert,	"Cannot insert into dataset. (No insert query)"
-	IBXConst_SCannotPost,	"Cannot post. (No update/insert query)"
-	IBXConst_SCannotUpdate,	"Cannot update. (No update query)"
-	IBXConst_SCannotDelete,	"Cannot delete from dataset. (No delete query)"
-	IBXConst_SCannotRefresh,	"Cannot refresh row. (No refresh query)"
-	IBXConst_SBufferNotSet,	"Buffer not set"
-	IBXConst_SCircularReference,	"Circular references not permitted"
-	IBXConst_SSQLParseError,	"SQL Parse Error:\r\n\r\n%s"
-	IBXConst_SDatabaseNotAssigned,	"Database not assigned"
-	IBXConst_STransactionNotAssigned,	"Transaction not assigned"
-	IBXConst_SXSQLDAIndexOutOfRange,	"XSQLDA index out of range"
-	IBXConst_SXSQLDANameDoesNotExist,	"XSQLDA name does not exist (%s)"
-	IBXConst_SEOF,	"End of file"
-	IBXConst_SBOF,	"Beginning of file"
-	IBXConst_SInvalidStatementHandle,	"Invalid statement handle"
-	IBXConst_SSQLOpen,	"IBSQL Open"
-	IBXConst_SSQLClosed,	"IBSQL Closed"
-	IBXConst_SDatasetOpen,	"Dataset open"
-	IBXConst_SDatasetClosed,	"Dataset closed"
-	IBXConst_SUnknownSQLDataType,	"Unknown SQL Data type (%d)"
-	IBXConst_SInvalidColumnIndex,	"Invalid column index (index exceeds permitted range)"
-	IBXConst_SInvalidParamColumnIndex,	"Invalid parameter index (index exceeds permitted range)"
-	IBXConst_SInvalidDataConversion,	"Invalid data conversion"
-	IBXConst_SColumnIsNotNullable,	"Column cannot be set to null (%s)"
-	IBXConst_SCannotSetDatabase,	"Cannot set database"
-	IBXConst_SCannotSetTransaction,	"Cannot set transaction"
-	IBXConst_SOperationCancelled,	"Operation cancelled at user's request"
-	IBXConst_SDPBConstantNotSupported,	"DPB Constant (isc_dpb_%s) is unsupported"
-	IBXConst_SDPBConstantUnknown,	"DPB Constant (%d) is unknown"
-	IBXConst_STPBConstantNotSupported,	"TPB Constant (isc_tpb_%s) is unsupported"
-	IBXConst_STPBConstantUnknown,	"TPB Constant (%d) is unknown"
-	IBXConst_SDatabaseClosed,	"Cannot perform operation -- DB is not open"
-	IBXConst_SDatabaseOpen,	"Cannot perform operation -- DB is currently open"
-	IBXConst_SDatabaseNameMissing,	"Database name is missing"
-	IBXConst_SNotInTransaction,	"Transaction is not active"
-	IBXConst_SInTransaction,	"Transaction is active"
-	IBXConst_STimeoutNegative,	"Timeout values cannot be negative"
-	IBXConst_SNoDatabasesInTransaction,	"No databases are listed in transaction component"
-	IBXConst_SUpdateWrongDB,	"Updating wrong database"
-	IBXConst_SUpdateWrongTR,	"Updating wrong transaction. Unique transaction expected in set"
-	IBSQLMonitor_StrPlan,	"  Plan: "
-	IBSQLMonitor_StrPlanCantRetrive,	"  Plan: Can't retrieve plan - too large"
-	IBSQLMonitor_StrCommitHardComm,	": [Commit (Hard commit)]"
-	IBSQLMonitor_StrCommitRetaining,	": [Commit retaining (Soft commit)]"
-	IBSQLMonitor_StrRollback,	": [Rollback]"
-	IBSQLMonitor_StrRollbackRetainin,	": [Rollback retaining (Soft rollback)]"
-	IBSQLMonitor_StrStartTransaction,	": [Start transaction]"
-	IBSQLMonitor_StrApplication,	"[Application: "
-	IBXConst_SUnknownError,	"Unknown error"
-	IBXConst_SInterBaseMissing,	"InterBase library gds32.dll not found in the path. Please install InterBase to use this functionality"
-	IBXConst_SInterBaseInstallMissing,	"InterBase Install DLL ibinstall.dll not found in the path. Please install InterBase 6 to use this functionality"
-	IBXConst_SIB60feature,	"%s is an InterBase 6 function. Please upgrade to InterBase 6 to use this functonality"
-	IBXConst_SNotSupported,	"Unsupported feature"
-	IBXConst_SNotPermitted,	"Not permitted"
-	IBXConst_SFileAccessError,	"Temporary file access error"
-	IBXConst_SConnectionTimeout,	"Database connection timed out"
-	uDARes_err_DatasetNotAccessible,	"Access to dataset %s has not been permitted."
-	uDARes_err_CommandNotAccessible,	"executon of command %s has not been permitted."
-	uDARes_err_SQLNotPermitted,	"Execution of the specified SQL statement has not been permitted."
+	IBXConst_SIB80feature,	"%s is an InterBase 2007 function. Please upgrade to InterBase 2007 to use this functonality"
 	IBSQLMonitor_StrConnect,	": [Connect]"
 	IBSQLMonitor_StrDisconnect,	": [Disconnect]"
 	IBSQLMonitor_StrMisc,	"[Misc] "
@@ -2082,6 +1952,136 @@ BEGIN
 	IBSQLMonitor_StrBLOB,	"<BLOB>"
 	IBSQLMonitor_StrFetch,	": [Fetch] "
 	IBSQLMonitor_StrPrepare,	": [Prepare] "
+	IBSQLMonitor_StrPlan,	"  Plan: "
+	IBSQLMonitor_StrPlanCantRetrive,	"  Plan: Can't retrieve plan - too large"
+	IBXConst_SOptionNeedsClient,	"%s component requires Client to function properly"
+	IBXConst_SOptionNeedsServer,	"%s component requires Server to function properly"
+	IBXConst_SInvalidOption,	"Invalid option specified"
+	IBXConst_SInvalidOnErrorResult,	"Unexpected onError return value"
+	IBXConst_SInvalidOnStatusResult,	"Unexpected onStatus return value"
+	IBXConst_SDPBConstantUnknownEx,	"DPB Constant (%s) is unknown"
+	IBXConst_STPBConstantUnknownEx,	"TPB Constant (%s) is unknown"
+	IBXConst_SUnknownPlan,	"Unknown Error - Can't retrieve plan"
+	IBXConst_SFieldSizeMismatch,	"Size Mismatch - Field %s size is too small for data"
+	IBXConst_SEventAlreadyRegistered,	"Events already registered"
+	IBXConst_SStringTooLarge,	"Trying to store a string of length %d into a field that can only contain %d"
+	IBXConst_SNoTimers,	"Not enough timers available"
+	IBXConst_SIB65feature,	"%s is an InterBase 6.5 function. Please upgrade to InterBase 6.5 to use this functonality"
+	IBXConst_SLoginPromptFailure,	"Can not find default login prompt dialog.  Please add DBLogDlg to the uses section of your main file."
+	IBXConst_SIB70feature,	"%s is an InterBase 7.0 function. Please upgrade to InterBase 7.0 to use this functonality"
+	IBXConst_SIB71feature,	"%s is an InterBase 7.1 function. Please upgrade to InterBase 7.1 to use this functonality"
+	IBXConst_SQueryParamsError,	"Query Parameters missing or incorrect"
+	IBXConst_SStartParamsError,	"start Parameters missing or incorrect"
+	IBXConst_SOutputParsingError,	"Unexpected Output buffer value"
+	IBXConst_SUseSpecificProcedures,	"Generic ServiceStart not applicable: Use Specific Procedures to set configuration params"
+	IBXConst_SSQLMonitorAlreadyPresent,	"SQL Monitor Instance is already present"
+	IBXConst_SCantPrintValue,	"Cannot print value"
+	IBXConst_SEOFReached,	"SEOFReached"
+	IBXConst_SEOFInComment,	"EOF in comment detected"
+	IBXConst_SEOFInString,	"EOF in string detected"
+	IBXConst_SParamNameExpected,	"Parameter name expected"
+	IBXConst_SSuccess,	"Successful execution"
+	IBXConst_SDelphiException,	"DelphiException %s"
+	IBXConst_SNoOptionsSet,	"No Install Options selected"
+	IBXConst_SNoDestinationDirectory,	"DestinationDirectory is not set"
+	IBXConst_SNosourceDirectory,	"SourceDirectory is not set"
+	IBXConst_SNoUninstallFile,	"Uninstall File Name is not set"
+	IBXConst_SCannotDropSystemIndex,	"Cannot Drop System Index"
+	IBXConst_STableNameMismatch,	"Table Name Mismatch"
+	IBXConst_SIndexFieldMissing,	"Index Field Missing"
+	IBXConst_SInvalidCancellation,	"Cannot Cancel events while processing"
+	IBXConst_SInvalidEvent,	"Invalid Event"
+	IBXConst_SMaximumEvents,	"Exceded Maximum Event limits"
+	IBXConst_SNoEventsRegistered,	"No Events Registered"
+	IBXConst_SInvalidQueueing,	"Invalid Queueing"
+	IBXConst_SInvalidRegistration,	"Invalid Registration"
+	IBXConst_SInvalidBatchMove,	"Invalid Batch Move"
+	IBXConst_SSQLDialectInvalid,	"SQL Dialect Invalid"
+	IBXConst_SSPBConstantNotSupported,	"SPB Constant Not supported"
+	IBXConst_SSPBConstantUnknown,	"SPB Constant Unknown"
+	IBXConst_SServiceActive,	"Cannot perform operation -- service is not attached"
+	IBXConst_SServiceInActive,	"Cannot perform operation -- service is attached"
+	IBXConst_SServerNameMissing,	"Server Name Missing"
+	IBXConst_SColumnTypesDontMatch,	"Column types don't match. (From index: %d; To index: %d)"
+	IBXConst_SCantEndSharedTransaction,	"Can't end a shared transaction unless it is forced and equal to the transaction's TimeoutAction"
+	IBXConst_SFieldUnsupportedType,	"Unsupported Field Type"
+	IBXConst_SCircularDataLink,	"Circular DataLink Reference"
+	IBXConst_SEmptySQLStatement,	"Empty SQL Statement"
+	IBXConst_SIsASelectStatement,	"use Open for a Select Statement"
+	IBXConst_SRequiredParamNotSet,	"Required Param value not set"
+	IBXConst_SNoStoredProcName,	"No Stored Procedure Name assigned"
+	IBXConst_SIsAExecuteProcedure,	"use ExecProc for Procedure; use TQuery for Select procedures"
+	IBXConst_SUpdateFailed,	"Update Failed"
+	IBXConst_SNotCachedUpdates,	"CachedUpdates not enabled"
+	IBXConst_SNotLiveRequest,	"Request is not live - cannot modify"
+	IBXConst_SNoProvider,	"No Provider"
+	IBXConst_SNoRecordsAffected,	"No Records Affected"
+	IBXConst_SNoTableName,	"No Table Name assigned"
+	IBXConst_SCannotCreatePrimaryIndex,	"Cannot Create Primary Index; are created automatically"
+	IBXConst_SFieldReadOnly,	"Field \"%s\" is read-only"
+	IBXConst_SFieldNotFound,	"Field \"%s\" not found"
+	IBXConst_SNotEditing,	"Not in edit mode"
+	IBXConst_SCannotInsert,	"Cannot insert into dataset. (No insert query)"
+	IBXConst_SCannotPost,	"Cannot post. (No update/insert query)"
+	IBXConst_SCannotUpdate,	"Cannot update. (No update query)"
+	IBXConst_SCannotDelete,	"Cannot delete from dataset. (No delete query)"
+	IBXConst_SCannotRefresh,	"Cannot refresh row. (No refresh query)"
+	IBXConst_SBufferNotSet,	"Buffer not set"
+	IBXConst_SCircularReference,	"Circular references not permitted"
+	IBXConst_SSQLParseError,	"SQL Parse Error:\r\n\r\n%s"
+	IBXConst_SUserAbort,	"User abort"
+	IBXConst_SDataSetUniDirectional,	"Data set is uni-directional"
+	IBXConst_SCannotCreateSharedResource,	"Cannot create shared resource. (Windows error %d)"
+	IBXConst_SWindowsAPIError,	"Windows API error. (Windows error %d [$%.8x])"
+	IBXConst_SColumnListsDontMatch,	"Column lists do not match"
+	IBXConst_SBOF,	"Beginning of file"
+	IBXConst_SInvalidStatementHandle,	"Invalid statement handle"
+	IBXConst_SSQLOpen,	"IBSQL Open"
+	IBXConst_SSQLClosed,	"IBSQL Closed"
+	IBXConst_SDatasetOpen,	"Dataset open"
+	IBXConst_SDatasetClosed,	"Dataset closed"
+	IBXConst_SUnknownSQLDataType,	"Unknown SQL Data type (%d)"
+	IBXConst_SInvalidColumnIndex,	"Invalid column index (index exceeds permitted range)"
+	IBXConst_SInvalidParamColumnIndex,	"Invalid parameter index (index exceeds permitted range)"
+	IBXConst_SInvalidDataConversion,	"Invalid data conversion"
+	IBXConst_SColumnIsNotNullable,	"Column cannot be set to null (%s)"
+	IBXConst_SBlobCannotBeRead,	"Blob stream cannot be read"
+	IBXConst_SBlobCannotBeWritten,	"Blob stream cannot be written"
+	IBXConst_SEmptyQuery,	"Empty query"
+	IBXConst_SCannotOpenNonSQLSelect,	"Cannot \"open\" a non-select statement. Use ExecQuery"
+	IBXConst_SNoFieldAccess,	"No access to field \"%s\""
+	IBXConst_STPBConstantNotSupported,	"TPB Constant (isc_tpb_%s) is unsupported"
+	IBXConst_STPBConstantUnknown,	"TPB Constant (%d) is unknown"
+	IBXConst_SDatabaseClosed,	"Cannot perform operation -- DB is not open"
+	IBXConst_SDatabaseOpen,	"Cannot perform operation -- DB is currently open"
+	IBXConst_SDatabaseNameMissing,	"Database name is missing"
+	IBXConst_SNotInTransaction,	"Transaction is not active"
+	IBXConst_SInTransaction,	"Transaction is active"
+	IBXConst_STimeoutNegative,	"Timeout values cannot be negative"
+	IBXConst_SNoDatabasesInTransaction,	"No databases are listed in transaction component"
+	IBXConst_SUpdateWrongDB,	"Updating wrong database"
+	IBXConst_SUpdateWrongTR,	"Updating wrong transaction. Unique transaction expected in set"
+	IBXConst_SDatabaseNotAssigned,	"Database not assigned"
+	IBXConst_STransactionNotAssigned,	"Transaction not assigned"
+	IBXConst_SXSQLDAIndexOutOfRange,	"XSQLDA index out of range"
+	IBXConst_SXSQLDANameDoesNotExist,	"XSQLDA name does not exist (%s)"
+	IBXConst_SEOF,	"End of file"
+	uDARes_err_DatasetNotAccessible,	"Access to dataset %s has not been permitted."
+	uDARes_err_CommandNotAccessible,	"executon of command %s has not been permitted."
+	uDARes_err_SQLNotPermitted,	"Execution of the specified SQL statement has not been permitted."
+	IBXConst_SUnknownError,	"Unknown error"
+	IBXConst_SInterBaseMissing,	"InterBase library gds32.dll not found in the path. Please install InterBase to use this functionality"
+	IBXConst_SInterBaseInstallMissing,	"InterBase Install DLL ibinstall.dll not found in the path. Please install InterBase 6 to use this functionality"
+	IBXConst_SIB60feature,	"%s is an InterBase 6 function. Please upgrade to InterBase 6 to use this functonality"
+	IBXConst_SNotSupported,	"Unsupported feature"
+	IBXConst_SNotPermitted,	"Not permitted"
+	IBXConst_SFileAccessError,	"Temporary file access error"
+	IBXConst_SConnectionTimeout,	"Database connection timed out"
+	IBXConst_SCannotSetDatabase,	"Cannot set database"
+	IBXConst_SCannotSetTransaction,	"Cannot set transaction"
+	IBXConst_SOperationCancelled,	"Operation cancelled at user's request"
+	IBXConst_SDPBConstantNotSupported,	"DPB Constant (isc_dpb_%s) is unsupported"
+	IBXConst_SDPBConstantUnknown,	"DPB Constant (%d) is unknown"
 	uDARes_err_FieldIsNotBound,	"Field is not bound"
 	uDARes_err_CannotFindField,	"Cannot find field %s"
 	uDARes_err_LoadPackageFailed,	"LoadPackage failed for file %s"
@@ -2338,10 +2338,10 @@ BEGIN
 	JclResources_RsHKPDLong,	"HKEY_PERFORMANCE_DATA"
 	JclResources_RsHKCCLong,	"HKEY_CURRENT_CONFIG"
 	JclResources_RsHKDDLong,	"HKEY_DYN_DATA"
-	IdResourceStringsProtocols_RSHTTPErrorParsingCommand,	"Error in parsing command."
-	IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme,	"Unsupported authorization scheme."
-	IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive,	"Cannot change session state when the server is active."
-	IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered,	"This authentication method is already registered with class name %s."
+	IdResourceStringsCore_RSReplyInvalidCode,	"Reply Code is not valid: %s"
+	IdResourceStringsCore_RSThreadSchedulerThreadRequired,	"Thread must be specified for the scheduler."
+	IdResourceStringsCore_RSNoOnExecute,	"You must have an OnExecute event."
+	IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive,	"Cannot change the scheduler while the server is Active."
 	ComStrs_sTabFailClear,	"Failed to clear tab control"
 	ComStrs_sTabFailDelete,	"Failed to delete tab at index %d"
 	ComStrs_sTabFailRetrieve,	"Failed to retrieve tab at index %d"
@@ -2354,59 +2354,6 @@ BEGIN
 	ComStrs_sUDAssociated,	"%s is already associated with %s"
 	ComStrs_sPageIndexError,	"%d is an invalid PageIndex value.  PageIndex must be between 0 and %d"
 	JConsts_sChangeJPGSize,	"Cannot change the size of a JPEG image"
-	IdResourceStringsProtocols_RSHTTPRequestTimeout,	"Request Timeout"
-	IdResourceStringsProtocols_RSHTTPConflict,	"Conflict"
-	IdResourceStringsProtocols_RSHTTPGone,	"Gone"
-	IdResourceStringsProtocols_RSHTTPLengthRequired,	"Length Required"
-	IdResourceStringsProtocols_RSHTTPPreconditionFailed,	"Precondition Failed"
-	IdResourceStringsProtocols_RSHTTPRequestEntityToLong,	"Request Entity To Long"
-	IdResourceStringsProtocols_RSHTTPRequestURITooLong,	"Request-URI Too Long. 256 Chars max"
-	IdResourceStringsProtocols_RSHTTPUnsupportedMediaType,	"Unsupported Media Type"
-	IdResourceStringsProtocols_RSHTTPInternalServerError,	"Internal Server Error"
-	IdResourceStringsProtocols_RSHTTPNotImplemented,	"Not Implemented"
-	IdResourceStringsProtocols_RSHTTPBadGateway,	"Bad Gateway"
-	IdResourceStringsProtocols_RSHTTPServiceUnavailable,	"Service Unavailable"
-	IdResourceStringsProtocols_RSHTTPGatewayTimeout,	"Gateway timeout"
-	IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported,	"HTTP version not supported"
-	IdResourceStringsProtocols_RSHTTPUnknownResponseCode,	"Unknown Response Code"
-	IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten,	"Header has already been written."
-	IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation,	"Non-authoritative Information"
-	IdResourceStringsProtocols_RSHTTPNoContent,	"No Content"
-	IdResourceStringsProtocols_RSHTTPResetContent,	"Reset Content"
-	IdResourceStringsProtocols_RSHTTPPartialContent,	"Partial Content"
-	IdResourceStringsProtocols_RSHTTPMovedPermanently,	"Moved Permanently"
-	IdResourceStringsProtocols_RSHTTPMovedTemporarily,	"Moved Temporarily"
-	IdResourceStringsProtocols_RSHTTPSeeOther,	"See Other"
-	IdResourceStringsProtocols_RSHTTPNotModified,	"Not Modified"
-	IdResourceStringsProtocols_RSHTTPUseProxy,	"Use Proxy"
-	IdResourceStringsProtocols_RSHTTPBadRequest,	"Bad Request"
-	IdResourceStringsProtocols_RSHTTPUnauthorized,	"Unauthorized"
-	IdResourceStringsProtocols_RSHTTPForbidden,	"Forbidden"
-	IdResourceStringsProtocols_RSHTTPNotFound,	"Not Found"
-	IdResourceStringsProtocols_RSHTTPMethodNotAllowed,	"Method not allowed"
-	IdResourceStringsProtocols_RSHTTPNotAcceptable,	"Not Acceptable"
-	IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired,	"Proxy Authentication Required"
-	IdResourceStringsCore_RSchedMaxThreadEx,	"The maximum number of threads for this scheduler is exceeded."
-	IdResourceStringsCore_RSTransparentProxyCannotBind,	"Transparent proxy cannot bind."
-	IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP,	"UDP Not supported by this proxy."
-	IdResourceStringsCore_RSBufferMissingTerminator,	"Buffer terminator must be specified."
-	IdResourceStringsCore_RSBufferInvalidStartPos,	"Buffer start position is invalid."
-	IdResourceStringsCore_RSReplyInvalidCode,	"Reply Code is not valid: %s"
-	IdResourceStringsCore_RSThreadSchedulerThreadRequired,	"Thread must be specified for the scheduler."
-	IdResourceStringsCore_RSNoOnExecute,	"You must have an OnExecute event."
-	IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive,	"Cannot change the scheduler while the server is Active."
-	IdResourceStringsProtocols_RSMIMEExtensionEmpty,	"Extension is empty"
-	IdResourceStringsProtocols_RSMIMEMIMETypeEmpty,	"Mimetype is empty"
-	IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists,	"Extension already exits"
-	IdResourceStringsProtocols_RSHTTPContinue,	"Continue"
-	IdResourceStringsProtocols_RSHTTPOK,	"OK"
-	IdResourceStringsProtocols_RSHTTPCreated,	"Created"
-	IdResourceStringsProtocols_RSHTTPAccepted,	"Accepted"
-	IdResourceStringsCore_RSSocksServerTTLExpiredError,	"TTL expired."
-	IdResourceStringsCore_RSSocksServerCommandError,	"Command not supported."
-	IdResourceStringsCore_RSSocksServerAddressError,	"Address type not supported."
-	IdResourceStringsCore_RSInterceptCircularLink,	"%d: Circular links are not allowed"
-	IdResourceStringsCore_RSNotEnoughDataInBuffer,	"Not enough data in buffer."
 	IdResourceStringsCore_RSTooMuchDataInBuffer,	"Too much data in buffer."
 	IdResourceStringsCore_RSFileNotFound,	"File \"%s\" not found"
 	IdResourceStringsCore_RSNotConnected,	"Not Connected"
@@ -2418,11 +2365,11 @@ BEGIN
 	IdResourceStringsCore_RSThreadTerminateAndWaitFor,	"Cannot call TerminateAndWaitFor on FreeAndTerminate threads"
 	IdResourceStringsCore_RSAlreadyConnected,	"Already connected."
 	IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded,	"Maximum number of line allowed exceeded"
-	IdResourceStrings_RSNotAllBytesSent,	"Not all bytes sent."
-	IdResourceStrings_RSPackageSizeTooBig,	"Package Size Too Big."
-	IdResourceStrings_RSSetSizeExceeded,	"Set Size Exceeded."
-	IdResourceStringsCore_RSSocksUDPNotSupported,	"UDP is not support in this SOCKS version."
-	IdResourceStringsCore_RSSocksRequestFailed,	"Request rejected or failed."
+	IdResourceStringsCore_RSchedMaxThreadEx,	"The maximum number of threads for this scheduler is exceeded."
+	IdResourceStringsCore_RSTransparentProxyCannotBind,	"Transparent proxy cannot bind."
+	IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP,	"UDP Not supported by this proxy."
+	IdResourceStringsCore_RSBufferMissingTerminator,	"Buffer terminator must be specified."
+	IdResourceStringsCore_RSBufferInvalidStartPos,	"Buffer start position is invalid."
 	IdResourceStringsCore_RSSocksRequestServerFailed,	"Request rejected because SOCKS server cannot connect."
 	IdResourceStringsCore_RSSocksRequestIdentFailed,	"Request rejected because the client program and identd report different user-ids."
 	IdResourceStringsCore_RSSocksUnknownError,	"Unknown socks error."
@@ -2434,6 +2381,59 @@ BEGIN
 	IdResourceStringsCore_RSSocksServerNetUnreachableError,	"Network unreachable."
 	IdResourceStringsCore_RSSocksServerHostUnreachableError,	"Host unreachable."
 	IdResourceStringsCore_RSSocksServerConnectionRefusedError,	"Connection refused."
+	IdResourceStringsCore_RSSocksServerTTLExpiredError,	"TTL expired."
+	IdResourceStringsCore_RSSocksServerCommandError,	"Command not supported."
+	IdResourceStringsCore_RSSocksServerAddressError,	"Address type not supported."
+	IdResourceStringsCore_RSInterceptCircularLink,	"%d: Circular links are not allowed"
+	IdResourceStringsCore_RSNotEnoughDataInBuffer,	"Not enough data in buffer."
+	IdResourceStringsProtocols_RSHTTPRequestURITooLong,	"Request-URI Too Long. 256 Chars max"
+	IdResourceStringsProtocols_RSHTTPUnsupportedMediaType,	"Unsupported Media Type"
+	IdResourceStringsProtocols_RSHTTPInternalServerError,	"Internal Server Error"
+	IdResourceStringsProtocols_RSHTTPNotImplemented,	"Not Implemented"
+	IdResourceStringsProtocols_RSHTTPBadGateway,	"Bad Gateway"
+	IdResourceStringsProtocols_RSHTTPServiceUnavailable,	"Service Unavailable"
+	IdResourceStringsProtocols_RSHTTPGatewayTimeout,	"Gateway timeout"
+	IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported,	"HTTP version not supported"
+	IdResourceStringsProtocols_RSHTTPUnknownResponseCode,	"Unknown Response Code"
+	IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten,	"Header has already been written."
+	IdResourceStringsProtocols_RSHTTPErrorParsingCommand,	"Error in parsing command."
+	IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme,	"Unsupported authorization scheme."
+	IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive,	"Cannot change session state when the server is active."
+	IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered,	"This authentication method is already registered with class name %s."
+	IdResourceStringsCore_RSSocksUDPNotSupported,	"UDP is not support in this SOCKS version."
+	IdResourceStringsCore_RSSocksRequestFailed,	"Request rejected or failed."
+	IdResourceStringsProtocols_RSHTTPSeeOther,	"See Other"
+	IdResourceStringsProtocols_RSHTTPNotModified,	"Not Modified"
+	IdResourceStringsProtocols_RSHTTPUseProxy,	"Use Proxy"
+	IdResourceStringsProtocols_RSHTTPBadRequest,	"Bad Request"
+	IdResourceStringsProtocols_RSHTTPUnauthorized,	"Unauthorized"
+	IdResourceStringsProtocols_RSHTTPForbidden,	"Forbidden"
+	IdResourceStringsProtocols_RSHTTPNotFound,	"Not Found"
+	IdResourceStringsProtocols_RSHTTPMethodNotAllowed,	"Method not allowed"
+	IdResourceStringsProtocols_RSHTTPNotAcceptable,	"Not Acceptable"
+	IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired,	"Proxy Authentication Required"
+	IdResourceStringsProtocols_RSHTTPRequestTimeout,	"Request Timeout"
+	IdResourceStringsProtocols_RSHTTPConflict,	"Conflict"
+	IdResourceStringsProtocols_RSHTTPGone,	"Gone"
+	IdResourceStringsProtocols_RSHTTPLengthRequired,	"Length Required"
+	IdResourceStringsProtocols_RSHTTPPreconditionFailed,	"Precondition Failed"
+	IdResourceStringsProtocols_RSHTTPRequestEntityToLong,	"Request Entity To Long"
+	IdResourceStrings_RSNotAllBytesSent,	"Not all bytes sent."
+	IdResourceStrings_RSPackageSizeTooBig,	"Package Size Too Big."
+	IdResourceStrings_RSSetSizeExceeded,	"Set Size Exceeded."
+	IdResourceStringsProtocols_RSMIMEExtensionEmpty,	"Extension is empty"
+	IdResourceStringsProtocols_RSMIMEMIMETypeEmpty,	"Mimetype is empty"
+	IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists,	"Extension already exits"
+	IdResourceStringsProtocols_RSHTTPContinue,	"Continue"
+	IdResourceStringsProtocols_RSHTTPOK,	"OK"
+	IdResourceStringsProtocols_RSHTTPCreated,	"Created"
+	IdResourceStringsProtocols_RSHTTPAccepted,	"Accepted"
+	IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation,	"Non-authoritative Information"
+	IdResourceStringsProtocols_RSHTTPNoContent,	"No Content"
+	IdResourceStringsProtocols_RSHTTPResetContent,	"Reset Content"
+	IdResourceStringsProtocols_RSHTTPPartialContent,	"Partial Content"
+	IdResourceStringsProtocols_RSHTTPMovedPermanently,	"Moved Permanently"
+	IdResourceStringsProtocols_RSHTTPMovedTemporarily,	"Moved Temporarily"
 	IdResourceStrings_RSStackEHOSTDOWN,	"Host is down."
 	IdResourceStrings_RSStackEHOSTUNREACH,	"No route to host."
 	IdResourceStrings_RSStackENOTEMPTY,	"Directory not empty"
@@ -2562,11 +2562,11 @@ BEGIN
 	DBConsts_SIndexFieldMissing,	"Cannot access index field '%s'"
 	DBConsts_SDuplicateIndexName,	"Duplicate index name '%s'"
 	DBConsts_SNoIndexForFields,	"No index for fields '%s'"
-	uRODECConst_sFMT_MIME64,	"MIME Base 64"
-	uRODECConst_sFMT_UU,	"UU Coding"
-	uRODECConst_sFMT_XX,	"XX Coding"
-	uRODECConst_sInvalidKeySize,	"Length from Encryptionkey is invalid.\r\nKeysize for %s must be within %d-%d bytes"
-	uRODECConst_sNotInitialized,	"%s is not initialized, call Init() or InitKey() first."
+	uRORes_err_MessageNotAssigned,	"Message is NIL"
+	ComConst_SOleError,	"OLE error %.8x"
+	ComConst_SNoMethod,	"Method '%s' not supported by automation object"
+	ComConst_SVarNotObject,	"Variant does not reference an automation object"
+	ComConst_STooManyParams,	"Dispatch methods do not support more than 64 parameters"
 	DBConsts_SInvalidFieldSize,	"Invalid field size"
 	DBConsts_SInvalidFieldKind,	"Invalid FieldKind"
 	DBConsts_SUnknownFieldType,	"Field '%s' is of an unknown type"
@@ -2578,30 +2578,6 @@ BEGIN
 	DBConsts_SFieldRangeError,	"%g is not a valid value for field '%s'. The allowed range is %g to %g"
 	DBConsts_SBcdFieldRangeError,	"%s is not a valid value for field '%s'. The allowed range is %s to %s"
 	DBConsts_SInvalidIntegerValue,	"'%s' is not a valid integer value for field '%s'"
-	uRORes_err_CannotLoadXMLDocument,	"Cannot load XML document.\rReason: %s\rLine: %d\rPosition: %d"
-	uRORes_err_ErrorCreatingMsXmlDoc,	"Error creating MSXML Document class\r\r%s: %s"
-	uRORes_err_NoXMLParsersAvailable,	"MSXML is not installed"
-	uRORes_err_IDispatchMarshalingNotSupported,	"Marshaling of IDispatch (%d) type variants is not supported."
-	uRORes_err_UnsupportedVariantType,	"Unsupported variant type \"%d\""
-	uRORes_err_VariantIsNotArray,	"Variant must be Array, but is %d"
-	uRORes_err_InvalidVarArrayDimCount,	"Variant Array DimCount must be 1 but is %d"
-	uRORes_err_CannotFindParameter,	"Cannot find parameter %s"
-	uRORes_err_MessageNotAssigned,	"Message is NIL"
-	uRODECConst_sProtectionCircular,	"Circular Protection detected, Protection Object is invalid."
-	uRODECConst_sStringFormatExists,	"String Format \"%d\" does not exist."
-	uRODECConst_sInvalidStringFormat,	"Input is not a valid %s Format."
-	uRODECConst_sInvalidFormatString,	"Input cannot be converted to %s Format."
-	uRODECConst_sFMT_COPY,	"copy Input to Output"
-	uRODECConst_sFMT_HEX,	"Hexadecimal"
-	uRODECConst_sFMT_HEXL,	"Hexadecimal lowercase"
-	uRORes_err_UnknownClass,	"Unknown class \"%s\""
-	uRORes_err_UnknownProxyInterface,	"Unknown proxy interface \"%s\""
-	uRORes_err_DispatcherAlreadyAssigned,	"Dispatcher for %s already assigned"
-	uRORes_err_CannotFindMessageDispatcher,	"Cannot find message dispatcher. Maybe there is no message component configured for the requested path?"
-	uRORes_err_ServerOnlySupportsOneDispatcher,	"%s servers only support one dispatcher"
-	uRORes_err_UnhandledException,	"Unhandled exception"
-	uRORes_err_ChannelBusy,	"Channel is busy. Try again later."
-	uRORes_err_ArrayIndexOutOfBounds,	"Array index out of bounds (%d)."
 	uRORes_err_InvalidHeader,	"Invalid binary header. Either incompatible or not a binary message."
 	uRORes_err_InvalidHeaderEncrypted,	"Invalid binary header. It seems that encryption is active on the other side of the communication, but not locally?"
 	uRORes_err_UnknownClassInStream,	"Unknown class \"%s\" found in stream."
@@ -2610,14 +2586,14 @@ BEGIN
 	uRORes_err_ChannelDoesntSupportIROMetadataReader,	"Channel does not support IROMetadataReader"
 	uRORes_err_TooManySessions,	"Too many sessions. Try again in %d minute(s)"
 	uRORes_err_DOMElementIsNIL,	"DOMElement is NIL"
-	uRORes_err_RodlStructCannotBeNested,	"Structs cannot recursively contain themselves."
-	uRORes_err_RodlInvalidAncestorType,	"Invalid or undefined ancestor type \"%s\"."
-	uRORes_str_ExceptionOnServer,	"An exception of type %s was raised on the server: %s"
-	uRORes_str_ExceptionReraisedFromServer,	"An exception was raised on the server: %s"
-	uRORes_err_AssignError,	"Cannot assign a \"%s\" to a \"%s\"."
-	uRORes_err_InvalidRequestStream,	"Invalid request stream (%d bytes)"
-	uRORes_err_NILMessage,	"Message is NIL"
-	uRORes_err_UnspecifiedInterface,	"The message does not have an interface name"
+	uRORes_err_CannotLoadXMLDocument,	"Cannot load XML document.\rReason: %s\rLine: %d\rPosition: %d"
+	uRORes_err_ErrorCreatingMsXmlDoc,	"Error creating MSXML Document class\r\r%s: %s"
+	uRORes_err_NoXMLParsersAvailable,	"MSXML is not installed"
+	uRORes_err_IDispatchMarshalingNotSupported,	"Marshaling of IDispatch (%d) type variants is not supported."
+	uRORes_err_UnsupportedVariantType,	"Unsupported variant type \"%d\""
+	uRORes_err_VariantIsNotArray,	"Variant must be Array, but is %d"
+	uRORes_err_InvalidVarArrayDimCount,	"Variant Array DimCount must be 1 but is %d"
+	uRORes_err_CannotFindParameter,	"Cannot find parameter %s"
 	uRORes_err_UnspecifiedMessage,	"The message does not have a name"
 	uRORes_err_UnknownMethod,	"Unknown method %s for interface %s"
 	uRORes_err_ClassFactoryDidNotReturnInstance,	"Class factory did not return an instance of \"%s\""
@@ -2626,14 +2602,14 @@ BEGIN
 	uRORes_err_ClassFactoryNotFound,	"Class factory for interface %s not found"
 	uRORes_err_IROMessageNotSupported,	"Class \"%s\" does not support IROMessage"
 	uRORes_err_ClassAlreadyRegistered,	"Class \"%s\" is already registered"
-	uRORes_err_InvalidIndex,	"Invalid index %d"
-	uRORes_err_InvalidType,	"Invalid type \"%s. Expected \"%s\"\""
-	uRORes_err_InvalidLibrary,	"Invalid library"
-	uRORes_err_InvalidStream,	"Invalid stream"
-	uRORes_err_InvalidTargetEntity,	"Invalid TargetEntity \"%s\""
-	uRORes_err_InvalidParamFlag,	"Invalid Parameter Flag \"%s\""
-	uRORes_err_InvalidStringLength,	"Stream read error: Invalid string length \"%d\""
-	uRORes_str_InvalidClassTypeInStream,	"Stream read error: Invalid class type encountered: \"%s\""
+	uRORes_err_UnknownClass,	"Unknown class \"%s\""
+	uRORes_err_UnknownProxyInterface,	"Unknown proxy interface \"%s\""
+	uRORes_err_DispatcherAlreadyAssigned,	"Dispatcher for %s already assigned"
+	uRORes_err_CannotFindMessageDispatcher,	"Cannot find message dispatcher. Maybe there is no message component configured for the requested path?"
+	uRORes_err_ServerOnlySupportsOneDispatcher,	"%s servers only support one dispatcher"
+	uRORes_err_UnhandledException,	"Unhandled exception"
+	uRORes_err_ChannelBusy,	"Channel is busy. Try again later."
+	uRORes_err_ArrayIndexOutOfBounds,	"Array index out of bounds (%d)."
 	uRORes_err_UnexpectedEndOfStream,	"Unexpected end of stream."
 	uRORes_err_RodlDuplicateName,	"Duplicate name."
 	uRORes_err_RodlNoDataTypeSpecified,	"No data type specified."
@@ -2642,6 +2618,30 @@ BEGIN
 	uRORes_err_RodlNoOperationsDefined,	"Service interface does not contain any elements."
 	uRORes_err_RodlUsedFileDoesNotExist,	"The referenced RODL file \"%s\" could not be found."
 	uRORes_err_RodlInvalidDataType,	"Invalid or undefined data type \"%s\"."
+	uRORes_err_RodlStructCannotBeNested,	"Structs cannot recursively contain themselves."
+	uRORes_err_RodlInvalidAncestorType,	"Invalid or undefined ancestor type \"%s\"."
+	uRORes_str_ExceptionOnServer,	"An exception of type %s was raised on the server: %s"
+	uRORes_str_ExceptionReraisedFromServer,	"An exception was raised on the server: %s"
+	uRORes_err_AssignError,	"Cannot assign a \"%s\" to a \"%s\"."
+	uRORes_err_InvalidRequestStream,	"Invalid request stream (%d bytes)"
+	uRORes_err_NILMessage,	"Message is NIL"
+	uRORes_err_UnspecifiedInterface,	"The message does not have an interface name"
+	uRODECConst_sFMT_COPY,	"copy Input to Output"
+	uRODECConst_sFMT_HEX,	"Hexadecimal"
+	uRODECConst_sFMT_HEXL,	"Hexadecimal lowercase"
+	uRODECConst_sFMT_MIME64,	"MIME Base 64"
+	uRODECConst_sFMT_UU,	"UU Coding"
+	uRODECConst_sFMT_XX,	"XX Coding"
+	uRODECConst_sInvalidKeySize,	"Length from Encryptionkey is invalid.\r\nKeysize for %s must be within %d-%d bytes"
+	uRODECConst_sNotInitialized,	"%s is not initialized, call Init() or InitKey() first."
+	uRORes_err_InvalidIndex,	"Invalid index %d"
+	uRORes_err_InvalidType,	"Invalid type \"%s. Expected \"%s\"\""
+	uRORes_err_InvalidLibrary,	"Invalid library"
+	uRORes_err_InvalidStream,	"Invalid stream"
+	uRORes_err_InvalidTargetEntity,	"Invalid TargetEntity \"%s\""
+	uRORes_err_InvalidParamFlag,	"Invalid Parameter Flag \"%s\""
+	uRORes_err_InvalidStringLength,	"Stream read error: Invalid string length \"%d\""
+	uRORes_str_InvalidClassTypeInStream,	"Stream read error: Invalid class type encountered: \"%s\""
 	Consts_SErrorSettingCount,	"Error setting %s.Count"
 	Consts_SListBoxMustBeVirtual,	"Listbox (%s) style must be virtual in order to set Count"
 	Consts_SANSIEncoding,	"ANSI"
@@ -2654,10 +2654,10 @@ BEGIN
 	Consts_STrayIconCreateError,	"Cannot create shell notification icon"
 	Consts_SPageControlNotSet,	"PageControl must first be assigned"
 	Consts_SWindowsVistaRequired,	"%s requires Windows Vista or later"
-	ComConst_SOleError,	"OLE error %.8x"
-	ComConst_SNoMethod,	"Method '%s' not supported by automation object"
-	ComConst_SVarNotObject,	"Variant does not reference an automation object"
-	ComConst_STooManyParams,	"Dispatch methods do not support more than 64 parameters"
+	uRODECConst_sProtectionCircular,	"Circular Protection detected, Protection Object is invalid."
+	uRODECConst_sStringFormatExists,	"String Format \"%d\" does not exist."
+	uRODECConst_sInvalidStringFormat,	"Input is not a valid %s Format."
+	uRODECConst_sInvalidFormatString,	"Input cannot be converted to %s Format."
 	Consts_SIconToClipboard,	"Clipboard does not support Icons"
 	Consts_SCannotOpenClipboard,	"Cannot open clipboard"
 	Consts_SInvalidMemoSize,	"Text exceeds memo capacity"
@@ -2932,41 +2932,41 @@ BEGIN
 	SysConst_SAccessDenied,	"File access denied"
 END
 
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\controls.res */
-/* C:\Varela_D2007\Lib\RemObjects\RemObjects_SDK\uROPoweredByRemObjectsButton.res */
-/* C:\Varela_D2007\Lib\RemObjects\RemObjects_SDK\uROHtmlServerInfo.res */
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\buttons.res */
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\extdlgs.res */
-/* C:\Varela_D2007\Lib\FastReport3\frxProgress.dfm */
-/* C:\Varela_D2007\Lib\FastReport3\frxCtrls.res */
-/* C:\Varela_D2007\Lib\FastReport3\frxPrintDialog.dfm */
-/* C:\Varela_D2007\Lib\FastReport3\frxDock.dfm */
-/* C:\Varela_D2007\Lib\FastReport3\frxPreviewPageSettings.dfm */
-/* C:\Varela_D2007\Lib\FastReport3\frxSearchDialog.dfm */
-/* C:\Varela_D2007\Lib\FastReport3\frxPreview.dfm */
-/* C:\Varela_D2007\Lib\FastReport3\frxPreview.res */
-/* C:\Varela_D2007\Lib\FastReport3\frxDialogForm.dfm */
+/* c:\archivos de programa\codegear\rad studio\5.0\Lib\Controls.res */
+/* C:\Archivos de programa\RemObjects Software\RemObjects SDK for Delphi\Source\uROPoweredByRemObjectsButton.res */
+/* C:\Archivos de programa\RemObjects Software\RemObjects SDK for Delphi\Source\uROHtmlServerInfo.res */
+/* c:\archivos de programa\codegear\rad studio\5.0\Lib\Buttons.res */
+/* c:\archivos de programa\codegear\rad studio\5.0\Lib\ExtDlgs.res */
+/* C:\Varela_D2007\Lib\FastReport3\frxProgress.DFM */
+/* C:\Varela_D2007\Lib\FastReport3\frxCtrls.RES */
+/* C:\Varela_D2007\Lib\FastReport3\frxPrintDialog.DFM */
+/* C:\Varela_D2007\Lib\FastReport3\frxDock.DFM */
+/* C:\Varela_D2007\Lib\FastReport3\frxPreviewPageSettings.DFM */
+/* C:\Varela_D2007\Lib\FastReport3\frxSearchDialog.DFM */
+/* C:\Varela_D2007\Lib\FastReport3\frxPreview.DFM */
+/* C:\Varela_D2007\Lib\FastReport3\frxPreview.RES */
+/* C:\Varela_D2007\Lib\FastReport3\frxDialogForm.DFM */
 /* C:\Varela_D2007\Lib\FastReport3\frxPassw.dfm */
-/* C:\Varela_D2007\Lib\FastReport3\frxClass.res */
+/* C:\Varela_D2007\Lib\FastReport3\frxClass.RES */
 /* C:\Varela_D2007\Lib\JVCL\JvConsts.res */
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */
-/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\DataAbstract_IBXDriver_Glyphs.res */
-/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\DataAbstract_ADODriver_Glyphs.res */
+/* c:\archivos de programa\codegear\rad studio\5.0\Lib\WindowsXP.res */
+/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_IBXDriver_Glyphs.res */
+/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_ADODriver_Glyphs.res */
 /* C:\Varela_D2007\Lib\JVCL\JvLogForm.dfm */
-/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\DataAbstract_BDEDriver_Glyphs.res */
-/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\DataAbstract_DBXDriver_Glyphs.res */
+/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_BDEDriver_Glyphs.res */
+/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_DBXDriver_Glyphs.res */
 /* C:\Varela_D2007\Source\Servidor\uDataModuleServer.dfm */
 /* C:\Varela_D2007\Source\Servidor\Configuracion\uFrameConfiguracion.dfm */
 /* C:\Varela_D2007\Lib\DevExpressVCL\dxOffice11.res */
 /* C:\Varela_D2007\Lib\DevExpressVCL\cxControls.res */
 /* C:\Varela_D2007\Lib\DevExpressVCL\cxLookAndFeelPainters.res */
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\filectrl.res */
+/* c:\archivos de programa\codegear\rad studio\5.0\Lib\FileCtrl.res */
 /* C:\Varela_D2007\Lib\DevExpressVCL\cxEdit.res */
 /* C:\Varela_D2007\Lib\DevExpressVCL\cxShellBrowser.dfm */
 /* C:\Varela_D2007\Source\Servidor\Configuracion\uConexionBD.dfm */
 /* C:\Varela_D2007\Source\Servidor\Configuracion\uConfGeneral.dfm */
 /* C:\Varela_D2007\Lib\JVCL\JvToolEdit.res */
-/* C:\Varela_D2007\Lib\JVCL\JvSpin.res */
+/* C:\Varela_D2007\Lib\JVCL\JvSpin.Res */
 /* C:\Varela_D2007\Source\Servidor\Configuracion\uConfFicherosEDI.dfm */
 /* C:\Varela_D2007\Source\Servidor\Configuracion\uConfiguracion.dfm */
 /* C:\Varela_D2007\Source\Servidor\EDI\EDI_Log_Impl.dfm */
@@ -2994,5 +2994,5 @@ END
 /* C:\Varela_D2007\Source\Servidor\Login_Impl.dfm */
 /* C:\Varela_D2007\Source\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.dfm */
 /* C:\Varela_D2007\Source\Servidor\AdminPV_Server.res */
-/* C:\Varela_D2007\Source\Servidor\RODLFILE.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf4E.tmp */
+/* C:\Varela_D2007\Source\Servidor\RODLFile.res */
+/* C:\Varela_D2007\Source\Servidor\AdminPV_Server.drf */
diff --git a/Source/Servidor/AdminPV_Server.rc b/Source/Servidor/AdminPV_Server.rc
index 4fc7150..fce5846 100644
--- a/Source/Servidor/AdminPV_Server.rc
+++ b/Source/Servidor/AdminPV_Server.rc
@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.1.4.0\0"
               VALUE "ProductName", "AdminPV_Server\0"
               VALUE "ProductVersion", "2.1.4.0\0"
-              VALUE "CompileDate", "lunes, 19 de mayo de 2008 16:33\0"
+              VALUE "CompileDate", "jueves, 16 de octubre de 2008 13:41\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/AdminPV_Server.res b/Source/Servidor/AdminPV_Server.res
index c88b966..69a5cca 100644
Binary files a/Source/Servidor/AdminPV_Server.res and b/Source/Servidor/AdminPV_Server.res differ