diff --git a/Source/Servidor/AdminPV_Server.dproj b/Source/Servidor/AdminPV_Server.dproj
index 6f62d35..bc246ca 100644
--- a/Source/Servidor/AdminPV_Server.dproj
+++ b/Source/Servidor/AdminPV_Server.dproj
@@ -1,166 +1,166 @@
-<?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">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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.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.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 05 de octubre de 2007 17:13</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="..\Base\uDataTableUtils.pas"/>
-		<DCCReference Include="..\Base\uDBSelectionList.pas"/>
-		<DCCReference Include="..\Base\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>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Devoluciones\Servidor\srvDevoluciones_Impl.pas">
-			<Form>srvDevoluciones</Form>
-		</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>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Recepciones\Servidor\srvRecepciones_Impl.pas">
-			<Form>srvRecepciones</Form>
-		</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>
-		</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>
-		</DCCReference>
-		<DCCReference Include="..\Modulos\Traspasos\Servidor\srvTraspasos_Impl.pas">
-			<Form>srvTraspasos</Form>
-		</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>
-		</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>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConexionBD.pas">
-			<Form>frConexionBD</Form>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConfFicherosEDI.pas">
-			<Form>frConfFicherosEDI</Form>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConfGeneral.pas">
-			<Form>frConfGeneral</Form>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uConfiguracion.pas">
-			<Form>fConfiguracion</Form>
-		</DCCReference>
-		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-			<Form>FrameConfiguracion</Form>
-		</DCCReference>
-		<DCCReference Include="EDI\EDI_INVRPT.pas"/>
-		<DCCReference Include="EDI\EDI_Reader.pas"/>
-		<DCCReference Include="EDI\EDI_SLSRPT.pas"/>
-		<DCCReference Include="EDI_Inventary_Impl.pas"/>
-		<DCCReference Include="EDI_Log_Impl.pas"/>
-		<DCCReference Include="EDI_Sales_Impl.pas"/>
-		<DCCReference Include="EDI_Utils.pas"/>
-		<DCCReference Include="fServerForm.pas">
-			<Form>ServerForm</Form>
-		</DCCReference>
-		<DCCReference Include="RegExpr.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>
-		</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>
-		</DCCReference>
-		<DCCReference Include="Services\Login\srvLogin_Impl.pas">
-			<Form>srvLogin</Form>
-		</DCCReference>
-		<DCCReference Include="Services\TransferenciaFicheros\srvTransfereciaFicheros_Impl.pas">
-			<Form>srvTransfereciaFicheros</Form>
-		</DCCReference>
-		<DCCReference Include="srvInformes_Impl.pas">
-			<Form>srvInformes</Form>
-		</DCCReference>
-		<DCCReference Include="uAcercaDe.pas">
-			<Form>fAcercaDe</Form>
-		</DCCReference>
-		<DCCReference Include="uDataModuleServer.pas">
-			<Form>dmServer</Form>
-		</DCCReference>
-		<DCCReference Include="uSchemaUtilsServer.pas"/>
-		<DCCReference Include="VARELA_Intf.pas"/>
-		<DCCReference Include="VARELA_Invk.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">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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.1.0.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.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 05 de octubre de 2007 17:13</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="..\Base\uDataTableUtils.pas" />
+    <DCCReference Include="..\Base\uDBSelectionList.pas" />
+    <DCCReference Include="..\Base\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>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Devoluciones\Servidor\srvDevoluciones_Impl.pas">
+      <Form>srvDevoluciones</Form>
+    </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>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Recepciones\Servidor\srvRecepciones_Impl.pas">
+      <Form>srvRecepciones</Form>
+    </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>
+    </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>
+    </DCCReference>
+    <DCCReference Include="..\Modulos\Traspasos\Servidor\srvTraspasos_Impl.pas">
+      <Form>srvTraspasos</Form>
+    </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>
+    </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>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConexionBD.pas">
+      <Form>frConexionBD</Form>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConfFicherosEDI.pas">
+      <Form>frConfFicherosEDI</Form>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConfGeneral.pas">
+      <Form>frConfGeneral</Form>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uConfiguracion.pas">
+      <Form>fConfiguracion</Form>
+    </DCCReference>
+    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+      <Form>FrameConfiguracion</Form>
+    </DCCReference>
+    <DCCReference Include="EDI\EDI_INVRPT.pas" />
+    <DCCReference Include="EDI\EDI_Reader.pas" />
+    <DCCReference Include="EDI\EDI_SLSRPT.pas" />
+    <DCCReference Include="EDI_Inventary_Impl.pas" />
+    <DCCReference Include="EDI_Log_Impl.pas" />
+    <DCCReference Include="EDI_Sales_Impl.pas" />
+    <DCCReference Include="EDI_Utils.pas" />
+    <DCCReference Include="fServerForm.pas">
+      <Form>ServerForm</Form>
+    </DCCReference>
+    <DCCReference Include="RegExpr.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>
+    </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>
+    </DCCReference>
+    <DCCReference Include="Services\Login\srvLogin_Impl.pas">
+      <Form>srvLogin</Form>
+    </DCCReference>
+    <DCCReference Include="Services\TransferenciaFicheros\srvTransfereciaFicheros_Impl.pas">
+      <Form>srvTransfereciaFicheros</Form>
+    </DCCReference>
+    <DCCReference Include="srvInformes_Impl.pas">
+      <Form>srvInformes</Form>
+    </DCCReference>
+    <DCCReference Include="uAcercaDe.pas">
+      <Form>fAcercaDe</Form>
+    </DCCReference>
+    <DCCReference Include="uDataModuleServer.pas">
+      <Form>dmServer</Form>
+    </DCCReference>
+    <DCCReference Include="uSchemaUtilsServer.pas" />
+    <DCCReference Include="VARELA_Intf.pas" />
+    <DCCReference Include="VARELA_Invk.pas" />
+  </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/AdminPV_Server.drc b/Source/Servidor/AdminPV_Server.drc
index be2936a..d149905 100644
--- a/Source/Servidor/AdminPV_Server.drc
+++ b/Source/Servidor/AdminPV_Server.drc
@@ -355,9 +355,9 @@
 #define DAConsts_SRefreshFailed 64397
 #define DAConsts_SInvalidFetchRows 64398
 #define DAConsts_SNoCorrespondParam 64399
-#define DBXPool_SConnectTimeout 64400
-#define DBXPool_SInvalidCommand 64401
-#define DBXTrace_SINVALID_TRACE_FLAG 64402
+#define SqlConst_SDriverNotInConfigFile 64400
+#define SqlConst_SObjectTypenameRequired 64401
+#define SqlConst_SCannotCreateFile 64402
 #define ZLibConst_sTargetBufferTooSmall 64403
 #define ZLibConst_sError 64404
 #define DAConsts_SUnknownDataType 64405
@@ -371,54 +371,54 @@
 #define DAConsts_SKeyFieldsReq 64413
 #define DAConsts_SNoKeyFields 64414
 #define DAConsts_SBadTableInfoName 64415
-#define SqlConst_SINVALIDTXNID 64416
-#define SqlConst_SDUPLICATETXNID 64417
-#define SqlConst_SDRIVERRESTRICTED 64418
-#define SqlConst_SLOCALTRANSACTIVE 64419
-#define SqlConst_SMULTIPLETRANSNOTENABLED 64420
-#define SqlConst_SCONNECTIONFAILED 64421
-#define SqlConst_SDRIVERINITFAILED 64422
-#define SqlConst_SOPTLOCKFAILED 64423
-#define SqlConst_SINVALIDREF 64424
-#define SqlConst_SNOTABLE 64425
-#define SqlConst_SMISSINGPARAMINSQL 64426
-#define SqlConst_SNOTIMPLEMENTED 64427
-#define SqlConst_SDRIVERINCOMPATIBLE 64428
-#define SqlConst_SDriverNotInConfigFile 64429
-#define SqlConst_SObjectTypenameRequired 64430
-#define SqlConst_SCannotCreateFile 64431
-#define SqlConst_SNOERROR 64432
-#define SqlConst_SWARNING 64433
-#define SqlConst_SNOMEMORY 64434
-#define SqlConst_SINVALIDFLDTYPE 64435
-#define SqlConst_SINVALIDHNDL 64436
-#define SqlConst_SNOTSUPPORTED 64437
-#define SqlConst_SINVALIDTIME 64438
-#define SqlConst_SINVALIDXLATION 64439
-#define SqlConst_SOUTOFRANGE 64440
-#define SqlConst_SINVALIDPARAM 64441
-#define SqlConst_SEOF 64442
-#define SqlConst_SSQLPARAMNOTSET 64443
-#define SqlConst_SINVALIDUSRPASS 64444
-#define SqlConst_SINVALIDPRECISION 64445
-#define SqlConst_SINVALIDLEN 64446
-#define SqlConst_SINVALIDXISOLEVEL 64447
-#define SqlConst_SEmptySQLStatement 64448
-#define SqlConst_SNoParameterValue 64449
-#define SqlConst_SNoSqlStatement 64450
-#define SqlConst_SMissingDataBaseName 64451
-#define SqlConst_SMissingDriverName 64452
-#define SqlConst_SPrepareError 64453
-#define SqlConst_SObjectNameError 64454
-#define SqlConst_SSQLDataSetOpen 64455
-#define SqlConst_SNoActiveTrans 64456
-#define SqlConst_SActiveTrans 64457
-#define SqlConst_SMissingDLLName 64458
-#define SqlConst_SMissingDriverRegFile 64459
-#define SqlConst_SNoCursor 64460
-#define SqlConst_SErrorMappingError 64461
-#define SqlConst_SStoredProcsNotSupported 64462
-#define SqlConst_SPackagesNotSupported 64463
+#define SqlConst_SINVALIDPRECISION 64416
+#define SqlConst_SINVALIDLEN 64417
+#define SqlConst_SINVALIDXISOLEVEL 64418
+#define SqlConst_SINVALIDTXNID 64419
+#define SqlConst_SDUPLICATETXNID 64420
+#define SqlConst_SDRIVERRESTRICTED 64421
+#define SqlConst_SLOCALTRANSACTIVE 64422
+#define SqlConst_SMULTIPLETRANSNOTENABLED 64423
+#define SqlConst_SCONNECTIONFAILED 64424
+#define SqlConst_SDRIVERINITFAILED 64425
+#define SqlConst_SOPTLOCKFAILED 64426
+#define SqlConst_SINVALIDREF 64427
+#define SqlConst_SNOTABLE 64428
+#define SqlConst_SMISSINGPARAMINSQL 64429
+#define SqlConst_SNOTIMPLEMENTED 64430
+#define SqlConst_SDRIVERINCOMPATIBLE 64431
+#define SqlConst_SErrorMappingError 64432
+#define SqlConst_SStoredProcsNotSupported 64433
+#define SqlConst_SPackagesNotSupported 64434
+#define SqlConst_SNOERROR 64435
+#define SqlConst_SWARNING 64436
+#define SqlConst_SNOMEMORY 64437
+#define SqlConst_SINVALIDFLDTYPE 64438
+#define SqlConst_SINVALIDHNDL 64439
+#define SqlConst_SNOTSUPPORTED 64440
+#define SqlConst_SINVALIDTIME 64441
+#define SqlConst_SINVALIDXLATION 64442
+#define SqlConst_SOUTOFRANGE 64443
+#define SqlConst_SINVALIDPARAM 64444
+#define SqlConst_SEOF 64445
+#define SqlConst_SSQLPARAMNOTSET 64446
+#define SqlConst_SINVALIDUSRPASS 64447
+#define SqlConst_SDatabaseClosed 64448
+#define SqlConst_SMissingSQLConnection 64449
+#define SqlConst_SConnectionNameMissing 64450
+#define SqlConst_SEmptySQLStatement 64451
+#define SqlConst_SNoParameterValue 64452
+#define SqlConst_SNoSqlStatement 64453
+#define SqlConst_SMissingDataBaseName 64454
+#define SqlConst_SMissingDriverName 64455
+#define SqlConst_SPrepareError 64456
+#define SqlConst_SObjectNameError 64457
+#define SqlConst_SSQLDataSetOpen 64458
+#define SqlConst_SNoActiveTrans 64459
+#define SqlConst_SActiveTrans 64460
+#define SqlConst_SMissingDLLName 64461
+#define SqlConst_SMissingDriverRegFile 64462
+#define SqlConst_SNoCursor 64463
 #define DBXCommon_SDriverLoadError 64464
 #define DBXCommon_SReaderNew 64465
 #define DBXCommon_SReaderClosed 64466
@@ -429,12 +429,12 @@
 #define DBXCommon_SInvalidOrdinal 64471
 #define DBXCommon_SDefaultErrorMessage 64472
 #define DBXCommon_SAlreadyPrepared 64473
-#define SqlConst_SLoginError 64474
-#define SqlConst_SMonitorActive 64475
-#define SqlConst_SDatabaseOpen 64476
-#define SqlConst_SDatabaseClosed 64477
-#define SqlConst_SMissingSQLConnection 64478
-#define SqlConst_SConnectionNameMissing 64479
+#define DBXPool_SConnectTimeout 64474
+#define DBXPool_SInvalidCommand 64475
+#define DBXTrace_SINVALID_TRACE_FLAG 64476
+#define SqlConst_SLoginError 64477
+#define SqlConst_SMonitorActive 64478
+#define SqlConst_SDatabaseOpen 64479
 #define bdeconst_SNoCachedUpdates 64480
 #define bdeconst_SInvalidAliasName 64481
 #define bdeconst_SNoFieldAccess 64482
@@ -483,150 +483,150 @@
 #define bdeconst_SInvalidSessionName 64525
 #define bdeconst_SDatabaseNameMissing 64526
 #define bdeconst_SSessionNameMissing 64527
-#define IBXConst_SUnknownPlan 64528
-#define IBXConst_SFieldSizeMismatch 64529
-#define IBXConst_SEventAlreadyRegistered 64530
-#define IBXConst_SStringTooLarge 64531
-#define IBXConst_SNoTimers 64532
-#define IBXConst_SIB65feature 64533
-#define IBXConst_SLoginPromptFailure 64534
-#define IBXConst_SIB70feature 64535
-#define IBXConst_SIB71feature 64536
-#define IBXConst_SIB80feature 64537
+#define IBSQLMonitor_StrFetch 64528
+#define IBSQLMonitor_StrPrepare 64529
+#define IBSQLMonitor_StrPlan 64530
+#define IBSQLMonitor_StrPlanCantRetrive 64531
+#define IBSQLMonitor_StrCommitHardComm 64532
+#define IBSQLMonitor_StrCommitRetaining 64533
+#define IBSQLMonitor_StrRollback 64534
+#define IBSQLMonitor_StrRollbackRetainin 64535
+#define IBSQLMonitor_StrStartTransaction 64536
+#define IBSQLMonitor_StrApplication 64537
 #define ADOConst_SMissingConnection 64538
 #define ADOConst_SNoDetailFilter 64539
 #define ADOConst_SBookmarksRequired 64540
 #define ADOConst_SMissingCommandText 64541
 #define ADOConst_SNoResultSet 64542
 #define ADOConst_SADOCreateError 64543
-#define IBXConst_SEOFInComment 64544
-#define IBXConst_SEOFInString 64545
-#define IBXConst_SParamNameExpected 64546
-#define IBXConst_SSuccess 64547
-#define IBXConst_SDelphiException 64548
-#define IBXConst_SNoOptionsSet 64549
-#define IBXConst_SNoDestinationDirectory 64550
-#define IBXConst_SNosourceDirectory 64551
-#define IBXConst_SNoUninstallFile 64552
-#define IBXConst_SOptionNeedsClient 64553
-#define IBXConst_SOptionNeedsServer 64554
-#define IBXConst_SInvalidOption 64555
-#define IBXConst_SInvalidOnErrorResult 64556
-#define IBXConst_SInvalidOnStatusResult 64557
-#define IBXConst_SDPBConstantUnknownEx 64558
-#define IBXConst_STPBConstantUnknownEx 64559
-#define IBXConst_SInvalidQueueing 64560
-#define IBXConst_SInvalidRegistration 64561
-#define IBXConst_SInvalidBatchMove 64562
-#define IBXConst_SSQLDialectInvalid 64563
-#define IBXConst_SSPBConstantNotSupported 64564
-#define IBXConst_SSPBConstantUnknown 64565
-#define IBXConst_SServiceActive 64566
-#define IBXConst_SServiceInActive 64567
-#define IBXConst_SServerNameMissing 64568
-#define IBXConst_SQueryParamsError 64569
-#define IBXConst_SStartParamsError 64570
-#define IBXConst_SOutputParsingError 64571
-#define IBXConst_SUseSpecificProcedures 64572
-#define IBXConst_SSQLMonitorAlreadyPresent 64573
-#define IBXConst_SCantPrintValue 64574
-#define IBXConst_SEOFReached 64575
-#define IBXConst_SNoStoredProcName 64576
-#define IBXConst_SIsAExecuteProcedure 64577
-#define IBXConst_SUpdateFailed 64578
-#define IBXConst_SNotCachedUpdates 64579
-#define IBXConst_SNotLiveRequest 64580
-#define IBXConst_SNoProvider 64581
-#define IBXConst_SNoRecordsAffected 64582
-#define IBXConst_SNoTableName 64583
-#define IBXConst_SCannotCreatePrimaryIndex 64584
-#define IBXConst_SCannotDropSystemIndex 64585
-#define IBXConst_STableNameMismatch 64586
-#define IBXConst_SIndexFieldMissing 64587
-#define IBXConst_SInvalidCancellation 64588
-#define IBXConst_SInvalidEvent 64589
-#define IBXConst_SMaximumEvents 64590
-#define IBXConst_SNoEventsRegistered 64591
-#define IBXConst_SCannotRefresh 64592
-#define IBXConst_SBufferNotSet 64593
-#define IBXConst_SCircularReference 64594
-#define IBXConst_SSQLParseError 64595
-#define IBXConst_SUserAbort 64596
-#define IBXConst_SDataSetUniDirectional 64597
-#define IBXConst_SCannotCreateSharedResource 64598
-#define IBXConst_SWindowsAPIError 64599
-#define IBXConst_SColumnListsDontMatch 64600
-#define IBXConst_SColumnTypesDontMatch 64601
-#define IBXConst_SCantEndSharedTransaction 64602
-#define IBXConst_SFieldUnsupportedType 64603
-#define IBXConst_SCircularDataLink 64604
-#define IBXConst_SEmptySQLStatement 64605
-#define IBXConst_SIsASelectStatement 64606
-#define IBXConst_SRequiredParamNotSet 64607
-#define IBXConst_SInvalidColumnIndex 64608
-#define IBXConst_SInvalidParamColumnIndex 64609
-#define IBXConst_SInvalidDataConversion 64610
-#define IBXConst_SColumnIsNotNullable 64611
-#define IBXConst_SBlobCannotBeRead 64612
-#define IBXConst_SBlobCannotBeWritten 64613
-#define IBXConst_SEmptyQuery 64614
-#define IBXConst_SCannotOpenNonSQLSelect 64615
-#define IBXConst_SNoFieldAccess 64616
-#define IBXConst_SFieldReadOnly 64617
-#define IBXConst_SFieldNotFound 64618
-#define IBXConst_SNotEditing 64619
-#define IBXConst_SCannotInsert 64620
-#define IBXConst_SCannotPost 64621
-#define IBXConst_SCannotUpdate 64622
-#define IBXConst_SCannotDelete 64623
-#define IBXConst_STimeoutNegative 64624
-#define IBXConst_SNoDatabasesInTransaction 64625
-#define IBXConst_SUpdateWrongDB 64626
-#define IBXConst_SUpdateWrongTR 64627
-#define IBXConst_SDatabaseNotAssigned 64628
-#define IBXConst_STransactionNotAssigned 64629
-#define IBXConst_SXSQLDAIndexOutOfRange 64630
-#define IBXConst_SXSQLDANameDoesNotExist 64631
-#define IBXConst_SEOF 64632
-#define IBXConst_SBOF 64633
-#define IBXConst_SInvalidStatementHandle 64634
-#define IBXConst_SSQLOpen 64635
-#define IBXConst_SSQLClosed 64636
-#define IBXConst_SDatasetOpen 64637
-#define IBXConst_SDatasetClosed 64638
-#define IBXConst_SUnknownSQLDataType 64639
-#define IBXConst_SNotSupported 64640
-#define IBXConst_SNotPermitted 64641
-#define IBXConst_SFileAccessError 64642
-#define IBXConst_SConnectionTimeout 64643
-#define IBXConst_SCannotSetDatabase 64644
-#define IBXConst_SCannotSetTransaction 64645
-#define IBXConst_SOperationCancelled 64646
-#define IBXConst_SDPBConstantNotSupported 64647
-#define IBXConst_SDPBConstantUnknown 64648
-#define IBXConst_STPBConstantNotSupported 64649
-#define IBXConst_STPBConstantUnknown 64650
-#define IBXConst_SDatabaseClosed 64651
-#define IBXConst_SDatabaseOpen 64652
-#define IBXConst_SDatabaseNameMissing 64653
-#define IBXConst_SNotInTransaction 64654
-#define IBXConst_SInTransaction 64655
-#define IBSQLMonitor_StrNULL 64656
-#define IBSQLMonitor_StrBLOB 64657
-#define IBSQLMonitor_StrFetch 64658
-#define IBSQLMonitor_StrPrepare 64659
-#define IBSQLMonitor_StrPlan 64660
-#define IBSQLMonitor_StrPlanCantRetrive 64661
-#define IBSQLMonitor_StrCommitHardComm 64662
-#define IBSQLMonitor_StrCommitRetaining 64663
-#define IBSQLMonitor_StrRollback 64664
-#define IBSQLMonitor_StrRollbackRetainin 64665
-#define IBSQLMonitor_StrStartTransaction 64666
-#define IBSQLMonitor_StrApplication 64667
-#define IBXConst_SUnknownError 64668
-#define IBXConst_SInterBaseMissing 64669
-#define IBXConst_SInterBaseInstallMissing 64670
-#define IBXConst_SIB60feature 64671
+#define IBXConst_SIB65feature 64544
+#define IBXConst_SLoginPromptFailure 64545
+#define IBXConst_SIB70feature 64546
+#define IBXConst_SIB71feature 64547
+#define IBXConst_SIB80feature 64548
+#define IBSQLMonitor_StrConnect 64549
+#define IBSQLMonitor_StrDisconnect 64550
+#define IBSQLMonitor_StrMisc 64551
+#define IBSQLMonitor_StrError 64552
+#define IBSQLMonitor_StrAttach 64553
+#define IBSQLMonitor_StrDetach 64554
+#define IBSQLMonitor_StrQuery 64555
+#define IBSQLMonitor_StrStart 64556
+#define IBSQLMonitor_StrExecute 64557
+#define IBSQLMonitor_StrNULL 64558
+#define IBSQLMonitor_StrBLOB 64559
+#define IBXConst_SNoOptionsSet 64560
+#define IBXConst_SNoDestinationDirectory 64561
+#define IBXConst_SNosourceDirectory 64562
+#define IBXConst_SNoUninstallFile 64563
+#define IBXConst_SOptionNeedsClient 64564
+#define IBXConst_SOptionNeedsServer 64565
+#define IBXConst_SInvalidOption 64566
+#define IBXConst_SInvalidOnErrorResult 64567
+#define IBXConst_SInvalidOnStatusResult 64568
+#define IBXConst_SDPBConstantUnknownEx 64569
+#define IBXConst_STPBConstantUnknownEx 64570
+#define IBXConst_SUnknownPlan 64571
+#define IBXConst_SFieldSizeMismatch 64572
+#define IBXConst_SEventAlreadyRegistered 64573
+#define IBXConst_SStringTooLarge 64574
+#define IBXConst_SNoTimers 64575
+#define IBXConst_SSPBConstantUnknown 64576
+#define IBXConst_SServiceActive 64577
+#define IBXConst_SServiceInActive 64578
+#define IBXConst_SServerNameMissing 64579
+#define IBXConst_SQueryParamsError 64580
+#define IBXConst_SStartParamsError 64581
+#define IBXConst_SOutputParsingError 64582
+#define IBXConst_SUseSpecificProcedures 64583
+#define IBXConst_SSQLMonitorAlreadyPresent 64584
+#define IBXConst_SCantPrintValue 64585
+#define IBXConst_SEOFReached 64586
+#define IBXConst_SEOFInComment 64587
+#define IBXConst_SEOFInString 64588
+#define IBXConst_SParamNameExpected 64589
+#define IBXConst_SSuccess 64590
+#define IBXConst_SDelphiException 64591
+#define IBXConst_SNoProvider 64592
+#define IBXConst_SNoRecordsAffected 64593
+#define IBXConst_SNoTableName 64594
+#define IBXConst_SCannotCreatePrimaryIndex 64595
+#define IBXConst_SCannotDropSystemIndex 64596
+#define IBXConst_STableNameMismatch 64597
+#define IBXConst_SIndexFieldMissing 64598
+#define IBXConst_SInvalidCancellation 64599
+#define IBXConst_SInvalidEvent 64600
+#define IBXConst_SMaximumEvents 64601
+#define IBXConst_SNoEventsRegistered 64602
+#define IBXConst_SInvalidQueueing 64603
+#define IBXConst_SInvalidRegistration 64604
+#define IBXConst_SInvalidBatchMove 64605
+#define IBXConst_SSQLDialectInvalid 64606
+#define IBXConst_SSPBConstantNotSupported 64607
+#define IBXConst_SDataSetUniDirectional 64608
+#define IBXConst_SCannotCreateSharedResource 64609
+#define IBXConst_SWindowsAPIError 64610
+#define IBXConst_SColumnListsDontMatch 64611
+#define IBXConst_SColumnTypesDontMatch 64612
+#define IBXConst_SCantEndSharedTransaction 64613
+#define IBXConst_SFieldUnsupportedType 64614
+#define IBXConst_SCircularDataLink 64615
+#define IBXConst_SEmptySQLStatement 64616
+#define IBXConst_SIsASelectStatement 64617
+#define IBXConst_SRequiredParamNotSet 64618
+#define IBXConst_SNoStoredProcName 64619
+#define IBXConst_SIsAExecuteProcedure 64620
+#define IBXConst_SUpdateFailed 64621
+#define IBXConst_SNotCachedUpdates 64622
+#define IBXConst_SNotLiveRequest 64623
+#define IBXConst_SBlobCannotBeWritten 64624
+#define IBXConst_SEmptyQuery 64625
+#define IBXConst_SCannotOpenNonSQLSelect 64626
+#define IBXConst_SNoFieldAccess 64627
+#define IBXConst_SFieldReadOnly 64628
+#define IBXConst_SFieldNotFound 64629
+#define IBXConst_SNotEditing 64630
+#define IBXConst_SCannotInsert 64631
+#define IBXConst_SCannotPost 64632
+#define IBXConst_SCannotUpdate 64633
+#define IBXConst_SCannotDelete 64634
+#define IBXConst_SCannotRefresh 64635
+#define IBXConst_SBufferNotSet 64636
+#define IBXConst_SCircularReference 64637
+#define IBXConst_SSQLParseError 64638
+#define IBXConst_SUserAbort 64639
+#define IBXConst_STransactionNotAssigned 64640
+#define IBXConst_SXSQLDAIndexOutOfRange 64641
+#define IBXConst_SXSQLDANameDoesNotExist 64642
+#define IBXConst_SEOF 64643
+#define IBXConst_SBOF 64644
+#define IBXConst_SInvalidStatementHandle 64645
+#define IBXConst_SSQLOpen 64646
+#define IBXConst_SSQLClosed 64647
+#define IBXConst_SDatasetOpen 64648
+#define IBXConst_SDatasetClosed 64649
+#define IBXConst_SUnknownSQLDataType 64650
+#define IBXConst_SInvalidColumnIndex 64651
+#define IBXConst_SInvalidParamColumnIndex 64652
+#define IBXConst_SInvalidDataConversion 64653
+#define IBXConst_SColumnIsNotNullable 64654
+#define IBXConst_SBlobCannotBeRead 64655
+#define IBXConst_SCannotSetTransaction 64656
+#define IBXConst_SOperationCancelled 64657
+#define IBXConst_SDPBConstantNotSupported 64658
+#define IBXConst_SDPBConstantUnknown 64659
+#define IBXConst_STPBConstantNotSupported 64660
+#define IBXConst_STPBConstantUnknown 64661
+#define IBXConst_SDatabaseClosed 64662
+#define IBXConst_SDatabaseOpen 64663
+#define IBXConst_SDatabaseNameMissing 64664
+#define IBXConst_SNotInTransaction 64665
+#define IBXConst_SInTransaction 64666
+#define IBXConst_STimeoutNegative 64667
+#define IBXConst_SNoDatabasesInTransaction 64668
+#define IBXConst_SUpdateWrongDB 64669
+#define IBXConst_SUpdateWrongTR 64670
+#define IBXConst_SDatabaseNotAssigned 64671
 #define VDBConsts_SInsertRecord 64672
 #define VDBConsts_SDeleteRecord 64673
 #define VDBConsts_SEditRecord 64674
@@ -634,15 +634,15 @@
 #define VDBConsts_SCancelEdit 64676
 #define VDBConsts_SRefreshRecord 64677
 #define VDBConsts_SRemoteLogin 64678
-#define IBSQLMonitor_StrConnect 64679
-#define IBSQLMonitor_StrDisconnect 64680
-#define IBSQLMonitor_StrMisc 64681
-#define IBSQLMonitor_StrError 64682
-#define IBSQLMonitor_StrAttach 64683
-#define IBSQLMonitor_StrDetach 64684
-#define IBSQLMonitor_StrQuery 64685
-#define IBSQLMonitor_StrStart 64686
-#define IBSQLMonitor_StrExecute 64687
+#define IBXConst_SUnknownError 64679
+#define IBXConst_SInterBaseMissing 64680
+#define IBXConst_SInterBaseInstallMissing 64681
+#define IBXConst_SIB60feature 64682
+#define IBXConst_SNotSupported 64683
+#define IBXConst_SNotPermitted 64684
+#define IBXConst_SFileAccessError 64685
+#define IBXConst_SConnectionTimeout 64686
+#define IBXConst_SCannotSetDatabase 64687
 #define uDARes_err_CannotFindDefaultItem 64688
 #define uDARes_err_PoolIsNotEmpty 64689
 #define uDARes_err_MaxPoolSizeReached 64690
@@ -915,86 +915,86 @@
 #define JConsts_sJPEGImageFile 64957
 #define JclResources_RsCannotCreateDir 64958
 #define JclResources_RsFileUtilsNoVersionInfo 64959
-#define IdResourceStringsProtocols_RSHTTPPreconditionFailed 64960
-#define IdResourceStringsProtocols_RSHTTPRequestEntityToLong 64961
-#define IdResourceStringsProtocols_RSHTTPRequestURITooLong 64962
-#define IdResourceStringsProtocols_RSHTTPUnsupportedMediaType 64963
-#define IdResourceStringsProtocols_RSHTTPInternalServerError 64964
-#define IdResourceStringsProtocols_RSHTTPNotImplemented 64965
-#define IdResourceStringsProtocols_RSHTTPBadGateway 64966
-#define IdResourceStringsProtocols_RSHTTPServiceUnavailable 64967
-#define IdResourceStringsProtocols_RSHTTPGatewayTimeout 64968
-#define IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported 64969
-#define IdResourceStringsProtocols_RSHTTPUnknownResponseCode 64970
-#define IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten 64971
-#define IdResourceStringsProtocols_RSHTTPErrorParsingCommand 64972
-#define IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme 64973
-#define IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive 64974
-#define IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered 64975
-#define IdResourceStringsProtocols_RSHTTPMovedPermanently 64976
-#define IdResourceStringsProtocols_RSHTTPMovedTemporarily 64977
-#define IdResourceStringsProtocols_RSHTTPSeeOther 64978
-#define IdResourceStringsProtocols_RSHTTPNotModified 64979
-#define IdResourceStringsProtocols_RSHTTPUseProxy 64980
-#define IdResourceStringsProtocols_RSHTTPBadRequest 64981
-#define IdResourceStringsProtocols_RSHTTPUnauthorized 64982
-#define IdResourceStringsProtocols_RSHTTPForbidden 64983
-#define IdResourceStringsProtocols_RSHTTPNotFound 64984
-#define IdResourceStringsProtocols_RSHTTPMethodNotAllowed 64985
-#define IdResourceStringsProtocols_RSHTTPNotAcceptable 64986
-#define IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired 64987
-#define IdResourceStringsProtocols_RSHTTPRequestTimeout 64988
-#define IdResourceStringsProtocols_RSHTTPConflict 64989
-#define IdResourceStringsProtocols_RSHTTPGone 64990
-#define IdResourceStringsProtocols_RSHTTPLengthRequired 64991
-#define IdResourceStringsCore_RSBufferInvalidStartPos 64992
-#define IdResourceStringsCore_RSReplyInvalidCode 64993
-#define IdResourceStringsCore_RSThreadSchedulerThreadRequired 64994
-#define IdResourceStringsCore_RSNoOnExecute 64995
-#define IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive 64996
-#define IdResourceStringsProtocols_RSMIMEExtensionEmpty 64997
-#define IdResourceStringsProtocols_RSMIMEMIMETypeEmpty 64998
-#define IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists 64999
-#define IdResourceStringsProtocols_RSHTTPContinue 65000
-#define IdResourceStringsProtocols_RSHTTPOK 65001
-#define IdResourceStringsProtocols_RSHTTPCreated 65002
-#define IdResourceStringsProtocols_RSHTTPAccepted 65003
-#define IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation 65004
-#define IdResourceStringsProtocols_RSHTTPNoContent 65005
-#define IdResourceStringsProtocols_RSHTTPResetContent 65006
-#define IdResourceStringsProtocols_RSHTTPPartialContent 65007
-#define IdResourceStringsCore_RSNotEnoughDataInBuffer 65008
-#define IdResourceStringsCore_RSTooMuchDataInBuffer 65009
-#define IdResourceStringsCore_RSFileNotFound 65010
-#define IdResourceStringsCore_RSNotConnected 65011
-#define IdResourceStringsCore_RSObjectTypeNotSupported 65012
-#define IdResourceStringsCore_RSIdNoDataToRead 65013
-#define IdResourceStringsCore_RSReadTimeout 65014
-#define IdResourceStringsCore_RSReadLnMaxLineLengthExceeded 65015
-#define IdResourceStringsCore_RSConnectTimeout 65016
-#define IdResourceStringsCore_RSThreadTerminateAndWaitFor 65017
-#define IdResourceStringsCore_RSAlreadyConnected 65018
-#define IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded 65019
-#define IdResourceStringsCore_RSchedMaxThreadEx 65020
-#define IdResourceStringsCore_RSTransparentProxyCannotBind 65021
-#define IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP 65022
-#define IdResourceStringsCore_RSBufferMissingTerminator 65023
-#define IdResourceStringsCore_RSSocksRequestFailed 65024
-#define IdResourceStringsCore_RSSocksRequestServerFailed 65025
-#define IdResourceStringsCore_RSSocksRequestIdentFailed 65026
-#define IdResourceStringsCore_RSSocksUnknownError 65027
-#define IdResourceStringsCore_RSSocksServerRespondError 65028
-#define IdResourceStringsCore_RSSocksAuthMethodError 65029
-#define IdResourceStringsCore_RSSocksAuthError 65030
-#define IdResourceStringsCore_RSSocksServerGeneralError 65031
-#define IdResourceStringsCore_RSSocksServerPermissionError 65032
-#define IdResourceStringsCore_RSSocksServerNetUnreachableError 65033
-#define IdResourceStringsCore_RSSocksServerHostUnreachableError 65034
-#define IdResourceStringsCore_RSSocksServerConnectionRefusedError 65035
-#define IdResourceStringsCore_RSSocksServerTTLExpiredError 65036
-#define IdResourceStringsCore_RSSocksServerCommandError 65037
-#define IdResourceStringsCore_RSSocksServerAddressError 65038
-#define IdResourceStringsCore_RSInterceptCircularLink 65039
+#define IdResourceStringsCore_RSIdNoDataToRead 64960
+#define IdResourceStringsCore_RSReadTimeout 64961
+#define IdResourceStringsCore_RSReadLnMaxLineLengthExceeded 64962
+#define IdResourceStringsCore_RSConnectTimeout 64963
+#define IdResourceStringsCore_RSThreadTerminateAndWaitFor 64964
+#define IdResourceStringsCore_RSAlreadyConnected 64965
+#define IdResourceStringsCore_RSMaximumNumberOfCaptureLineExceeded 64966
+#define IdResourceStringsCore_RSchedMaxThreadEx 64967
+#define IdResourceStringsCore_RSTransparentProxyCannotBind 64968
+#define IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP 64969
+#define IdResourceStringsCore_RSBufferMissingTerminator 64970
+#define IdResourceStringsCore_RSBufferInvalidStartPos 64971
+#define IdResourceStringsCore_RSReplyInvalidCode 64972
+#define IdResourceStringsCore_RSThreadSchedulerThreadRequired 64973
+#define IdResourceStringsCore_RSNoOnExecute 64974
+#define IdResourceStringsCore_RSTCPServerSchedulerAlreadyActive 64975
+#define IdResourceStringsCore_RSSocksAuthMethodError 64976
+#define IdResourceStringsCore_RSSocksAuthError 64977
+#define IdResourceStringsCore_RSSocksServerGeneralError 64978
+#define IdResourceStringsCore_RSSocksServerPermissionError 64979
+#define IdResourceStringsCore_RSSocksServerNetUnreachableError 64980
+#define IdResourceStringsCore_RSSocksServerHostUnreachableError 64981
+#define IdResourceStringsCore_RSSocksServerConnectionRefusedError 64982
+#define IdResourceStringsCore_RSSocksServerTTLExpiredError 64983
+#define IdResourceStringsCore_RSSocksServerCommandError 64984
+#define IdResourceStringsCore_RSSocksServerAddressError 64985
+#define IdResourceStringsCore_RSInterceptCircularLink 64986
+#define IdResourceStringsCore_RSNotEnoughDataInBuffer 64987
+#define IdResourceStringsCore_RSTooMuchDataInBuffer 64988
+#define IdResourceStringsCore_RSFileNotFound 64989
+#define IdResourceStringsCore_RSNotConnected 64990
+#define IdResourceStringsCore_RSObjectTypeNotSupported 64991
+#define IdResourceStringsProtocols_RSHTTPBadGateway 64992
+#define IdResourceStringsProtocols_RSHTTPServiceUnavailable 64993
+#define IdResourceStringsProtocols_RSHTTPGatewayTimeout 64994
+#define IdResourceStringsProtocols_RSHTTPHTTPVersionNotSupported 64995
+#define IdResourceStringsProtocols_RSHTTPUnknownResponseCode 64996
+#define IdResourceStringsProtocols_RSHTTPHeaderAlreadyWritten 64997
+#define IdResourceStringsProtocols_RSHTTPErrorParsingCommand 64998
+#define IdResourceStringsProtocols_RSHTTPUnsupportedAuthorisationScheme 64999
+#define IdResourceStringsProtocols_RSHTTPCannotSwitchSessionStateWhenActive 65000
+#define IdResourceStringsProtocols_RSHTTPAuthAlreadyRegistered 65001
+#define IdResourceStringsCore_RSSocksUDPNotSupported 65002
+#define IdResourceStringsCore_RSSocksRequestFailed 65003
+#define IdResourceStringsCore_RSSocksRequestServerFailed 65004
+#define IdResourceStringsCore_RSSocksRequestIdentFailed 65005
+#define IdResourceStringsCore_RSSocksUnknownError 65006
+#define IdResourceStringsCore_RSSocksServerRespondError 65007
+#define IdResourceStringsProtocols_RSHTTPUnauthorized 65008
+#define IdResourceStringsProtocols_RSHTTPForbidden 65009
+#define IdResourceStringsProtocols_RSHTTPNotFound 65010
+#define IdResourceStringsProtocols_RSHTTPMethodNotAllowed 65011
+#define IdResourceStringsProtocols_RSHTTPNotAcceptable 65012
+#define IdResourceStringsProtocols_RSHTTPProxyAuthenticationRequired 65013
+#define IdResourceStringsProtocols_RSHTTPRequestTimeout 65014
+#define IdResourceStringsProtocols_RSHTTPConflict 65015
+#define IdResourceStringsProtocols_RSHTTPGone 65016
+#define IdResourceStringsProtocols_RSHTTPLengthRequired 65017
+#define IdResourceStringsProtocols_RSHTTPPreconditionFailed 65018
+#define IdResourceStringsProtocols_RSHTTPRequestEntityToLong 65019
+#define IdResourceStringsProtocols_RSHTTPRequestURITooLong 65020
+#define IdResourceStringsProtocols_RSHTTPUnsupportedMediaType 65021
+#define IdResourceStringsProtocols_RSHTTPInternalServerError 65022
+#define IdResourceStringsProtocols_RSHTTPNotImplemented 65023
+#define IdResourceStringsProtocols_RSMIMEMIMETypeEmpty 65024
+#define IdResourceStringsProtocols_RSMIMEMIMEExtAlreadyExists 65025
+#define IdResourceStringsProtocols_RSHTTPContinue 65026
+#define IdResourceStringsProtocols_RSHTTPOK 65027
+#define IdResourceStringsProtocols_RSHTTPCreated 65028
+#define IdResourceStringsProtocols_RSHTTPAccepted 65029
+#define IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation 65030
+#define IdResourceStringsProtocols_RSHTTPNoContent 65031
+#define IdResourceStringsProtocols_RSHTTPResetContent 65032
+#define IdResourceStringsProtocols_RSHTTPPartialContent 65033
+#define IdResourceStringsProtocols_RSHTTPMovedPermanently 65034
+#define IdResourceStringsProtocols_RSHTTPMovedTemporarily 65035
+#define IdResourceStringsProtocols_RSHTTPSeeOther 65036
+#define IdResourceStringsProtocols_RSHTTPNotModified 65037
+#define IdResourceStringsProtocols_RSHTTPUseProxy 65038
+#define IdResourceStringsProtocols_RSHTTPBadRequest 65039
 #define IdResourceStrings_RSStackClassUndefined 65040
 #define IdResourceStrings_RSStackAlreadyCreated 65041
 #define IdResourceStrings_RSAntiFreezeOnlyOne 65042
@@ -1010,7 +1010,7 @@
 #define IdResourceStrings_RSNotAllBytesSent 65052
 #define IdResourceStrings_RSPackageSizeTooBig 65053
 #define IdResourceStrings_RSSetSizeExceeded 65054
-#define IdResourceStringsCore_RSSocksUDPNotSupported 65055
+#define IdResourceStringsProtocols_RSMIMEExtensionEmpty 65055
 #define IdResourceStrings_RSStackENETRESET 65056
 #define IdResourceStrings_RSStackECONNABORTED 65057
 #define IdResourceStrings_RSStackECONNRESET 65058
@@ -1123,7 +1123,7 @@
 #define DBConsts_SCircularDataLink 65165
 #define DBConsts_SLookupInfoError 65166
 #define DBConsts_SDataSourceChange 65167
-#define uRODECConst_sNotInitialized 65168
+#define ComConst_STooManyParams 65168
 #define DBConsts_SInvalidFieldSize 65169
 #define DBConsts_SInvalidFieldKind 65170
 #define DBConsts_SUnknownFieldType 65171
@@ -1139,70 +1139,70 @@
 #define DBConsts_SInvalidFloatValue 65181
 #define DBConsts_SFieldTypeMismatch 65182
 #define DBConsts_SFieldSizeMismatch 65183
-#define uRORes_err_UnsupportedVariantType 65184
-#define uRORes_err_VariantIsNotArray 65185
-#define uRORes_err_InvalidVarArrayDimCount 65186
-#define uRORes_err_CannotFindParameter 65187
-#define uRORes_err_MessageNotAssigned 65188
-#define uRODECConst_sProtectionCircular 65189
-#define uRODECConst_sStringFormatExists 65190
-#define uRODECConst_sInvalidStringFormat 65191
-#define uRODECConst_sInvalidFormatString 65192
-#define uRODECConst_sFMT_COPY 65193
-#define uRODECConst_sFMT_HEX 65194
-#define uRODECConst_sFMT_HEXL 65195
-#define uRODECConst_sFMT_MIME64 65196
-#define uRODECConst_sFMT_UU 65197
-#define uRODECConst_sFMT_XX 65198
-#define uRODECConst_sInvalidKeySize 65199
-#define uRORes_err_ServerOnlySupportsOneDispatcher 65200
-#define uRORes_err_UnhandledException 65201
-#define uRORes_err_ChannelBusy 65202
-#define uRORes_err_ArrayIndexOutOfBounds 65203
-#define uRORes_err_InvalidHeader 65204
-#define uRORes_err_InvalidHeaderEncrypted 65205
-#define uRORes_err_UnknownClassInStream 65206
-#define uRORes_err_UnexpectedClassInStream 65207
-#define uRORes_err_SessionNotFound 65208
-#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65209
-#define uRORes_err_TooManySessions 65210
-#define uRORes_err_DOMElementIsNIL 65211
-#define uRORes_err_CannotLoadXMLDocument 65212
-#define uRORes_err_ErrorCreatingMsXmlDoc 65213
-#define uRORes_err_NoXMLParsersAvailable 65214
-#define uRORes_err_IDispatchMarshalingNotSupported 65215
-#define uRORes_err_AssignError 65216
-#define uRORes_err_InvalidRequestStream 65217
-#define uRORes_err_NILMessage 65218
-#define uRORes_err_UnspecifiedInterface 65219
-#define uRORes_err_UnspecifiedMessage 65220
-#define uRORes_err_UnknownMethod 65221
-#define uRORes_err_ClassFactoryDidNotReturnInstance 65222
-#define uRORes_err_ParameterNotFound 65223
-#define uRORes_err_TypeNotSupported 65224
-#define uRORes_err_ClassFactoryNotFound 65225
-#define uRORes_err_IROMessageNotSupported 65226
-#define uRORes_err_ClassAlreadyRegistered 65227
-#define uRORes_err_UnknownClass 65228
-#define uRORes_err_UnknownProxyInterface 65229
-#define uRORes_err_DispatcherAlreadyAssigned 65230
-#define uRORes_err_CannotFindMessageDispatcher 65231
-#define uRORes_err_InvalidTargetEntity 65232
-#define uRORes_err_InvalidParamFlag 65233
-#define uRORes_err_InvalidStringLength 65234
-#define uRORes_str_InvalidClassTypeInStream 65235
-#define uRORes_err_UnexpectedEndOfStream 65236
-#define uRORes_err_RodlDuplicateName 65237
-#define uRORes_err_RodlNoDataTypeSpecified 65238
-#define uRORes_err_RodlNoEnumValues 65239
-#define uRORes_err_RodlNoStructElementsDefined 65240
-#define uRORes_err_RodlNoOperationsDefined 65241
-#define uRORes_err_RodlUsedFileDoesNotExist 65242
-#define uRORes_err_RodlInvalidDataType 65243
-#define uRORes_err_RodlStructCannotBeNested 65244
-#define uRORes_err_RodlInvalidAncestorType 65245
-#define uRORes_str_ExceptionOnServer 65246
-#define uRORes_str_ExceptionReraisedFromServer 65247
+#define uRORes_err_SessionNotFound 65184
+#define uRORes_err_ChannelDoesntSupportIROMetadataReader 65185
+#define uRORes_err_TooManySessions 65186
+#define uRORes_err_DOMElementIsNIL 65187
+#define uRORes_err_CannotLoadXMLDocument 65188
+#define uRORes_err_ErrorCreatingMsXmlDoc 65189
+#define uRORes_err_NoXMLParsersAvailable 65190
+#define uRORes_err_IDispatchMarshalingNotSupported 65191
+#define uRORes_err_UnsupportedVariantType 65192
+#define uRORes_err_VariantIsNotArray 65193
+#define uRORes_err_InvalidVarArrayDimCount 65194
+#define uRORes_err_CannotFindParameter 65195
+#define uRORes_err_MessageNotAssigned 65196
+#define ComConst_SOleError 65197
+#define ComConst_SNoMethod 65198
+#define ComConst_SVarNotObject 65199
+#define uRORes_err_TypeNotSupported 65200
+#define uRORes_err_ClassFactoryNotFound 65201
+#define uRORes_err_IROMessageNotSupported 65202
+#define uRORes_err_ClassAlreadyRegistered 65203
+#define uRORes_err_UnknownClass 65204
+#define uRORes_err_UnknownProxyInterface 65205
+#define uRORes_err_DispatcherAlreadyAssigned 65206
+#define uRORes_err_CannotFindMessageDispatcher 65207
+#define uRORes_err_ServerOnlySupportsOneDispatcher 65208
+#define uRORes_err_UnhandledException 65209
+#define uRORes_err_ChannelBusy 65210
+#define uRORes_err_ArrayIndexOutOfBounds 65211
+#define uRORes_err_InvalidHeader 65212
+#define uRORes_err_InvalidHeaderEncrypted 65213
+#define uRORes_err_UnknownClassInStream 65214
+#define uRORes_err_UnexpectedClassInStream 65215
+#define uRORes_err_RodlNoStructElementsDefined 65216
+#define uRORes_err_RodlNoOperationsDefined 65217
+#define uRORes_err_RodlUsedFileDoesNotExist 65218
+#define uRORes_err_RodlInvalidDataType 65219
+#define uRORes_err_RodlStructCannotBeNested 65220
+#define uRORes_err_RodlInvalidAncestorType 65221
+#define uRORes_str_ExceptionOnServer 65222
+#define uRORes_str_ExceptionReraisedFromServer 65223
+#define uRORes_err_AssignError 65224
+#define uRORes_err_InvalidRequestStream 65225
+#define uRORes_err_NILMessage 65226
+#define uRORes_err_UnspecifiedInterface 65227
+#define uRORes_err_UnspecifiedMessage 65228
+#define uRORes_err_UnknownMethod 65229
+#define uRORes_err_ClassFactoryDidNotReturnInstance 65230
+#define uRORes_err_ParameterNotFound 65231
+#define uRODECConst_sFMT_UU 65232
+#define uRODECConst_sFMT_XX 65233
+#define uRODECConst_sInvalidKeySize 65234
+#define uRODECConst_sNotInitialized 65235
+#define uRORes_err_InvalidIndex 65236
+#define uRORes_err_InvalidType 65237
+#define uRORes_err_InvalidLibrary 65238
+#define uRORes_err_InvalidStream 65239
+#define uRORes_err_InvalidTargetEntity 65240
+#define uRORes_err_InvalidParamFlag 65241
+#define uRORes_err_InvalidStringLength 65242
+#define uRORes_str_InvalidClassTypeInStream 65243
+#define uRORes_err_UnexpectedEndOfStream 65244
+#define uRORes_err_RodlDuplicateName 65245
+#define uRORes_err_RodlNoDataTypeSpecified 65246
+#define uRORes_err_RodlNoEnumValues 65247
 #define Consts_SUnicodeEncoding 65248
 #define Consts_SBigEndianEncoding 65249
 #define Consts_SUTF8Encoding 65250
@@ -1211,14 +1211,14 @@
 #define Consts_STrayIconCreateError 65253
 #define Consts_SPageControlNotSet 65254
 #define Consts_SWindowsVistaRequired 65255
-#define ComConst_SOleError 65256
-#define ComConst_SNoMethod 65257
-#define ComConst_SVarNotObject 65258
-#define ComConst_STooManyParams 65259
-#define uRORes_err_InvalidIndex 65260
-#define uRORes_err_InvalidType 65261
-#define uRORes_err_InvalidLibrary 65262
-#define uRORes_err_InvalidStream 65263
+#define uRODECConst_sProtectionCircular 65256
+#define uRODECConst_sStringFormatExists 65257
+#define uRODECConst_sInvalidStringFormat 65258
+#define uRODECConst_sInvalidFormatString 65259
+#define uRODECConst_sFMT_COPY 65260
+#define uRODECConst_sFMT_HEX 65261
+#define uRODECConst_sFMT_HEXL 65262
+#define uRODECConst_sFMT_MIME64 65263
 #define Consts_SNoDefaultPrinter 65264
 #define Consts_SDuplicateMenus 65265
 #define Consts_SPictureLabel 65266
@@ -1840,9 +1840,9 @@ BEGIN
 	DAConsts_SRefreshFailed,	"Refresh failed. Found %d records"
 	DAConsts_SInvalidFetchRows,	"FetchRows must be 1..10000"
 	DAConsts_SNoCorrespondParam,	"Not found field corresponding parameter %s"
-	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_SDriverNotInConfigFile,	"Driver (%s) not found in Cfg file (%s)"
+	SqlConst_SObjectTypenameRequired,	"Object type name required as parameter value"
+	SqlConst_SCannotCreateFile,	"Cannot create file %s"
 	ZLibConst_sTargetBufferTooSmall,	"ZLib error: target buffer may be too small"
 	ZLibConst_sError,	"Error"
 	DAConsts_SUnknownDataType,	"Unknown data type"
@@ -1856,6 +1856,9 @@ BEGIN
 	DAConsts_SKeyFieldsReq,	"Unique keyfields required"
 	DAConsts_SNoKeyFields,	"Key fields not found"
 	DAConsts_SBadTableInfoName,	"TableInfo name must be provided"
+	SqlConst_SINVALIDPRECISION,	"[0x000D]: Invalid Precision"
+	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"
@@ -1869,9 +1872,9 @@ BEGIN
 	SqlConst_SMISSINGPARAMINSQL,	"[0x001A] Missing parameter marker in SQL"
 	SqlConst_SNOTIMPLEMENTED,	"[0x001B] Not implemented"
 	SqlConst_SDRIVERINCOMPATIBLE,	"[0x001C] Incompatible driver"
-	SqlConst_SDriverNotInConfigFile,	"Driver (%s) not found in Cfg file (%s)"
-	SqlConst_SObjectTypenameRequired,	"Object type name required as parameter value"
-	SqlConst_SCannotCreateFile,	"Cannot create file %s"
+	SqlConst_SErrorMappingError,	"SQL Error: Error mapping failed"
+	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"
@@ -1885,9 +1888,9 @@ BEGIN
 	SqlConst_SEOF,	"[0x000A]: Result set at EOF"
 	SqlConst_SSQLPARAMNOTSET,	"dbExpress Error [0x000B]: Parameter Not Set"
 	SqlConst_SINVALIDUSRPASS,	"[0x000C] Invalid Username/Password"
-	SqlConst_SINVALIDPRECISION,	"[0x000D]: Invalid Precision"
-	SqlConst_SINVALIDLEN,	"[0x000E]: Invalid Length"
-	SqlConst_SINVALIDXISOLEVEL,	"[0x000F]: Invalid Transaction Isolation Level"
+	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"
@@ -1901,9 +1904,6 @@ BEGIN
 	SqlConst_SMissingDLLName,	"DLL/Shared Library Name not Set"
 	SqlConst_SMissingDriverRegFile,	"Driver/Connection Registry File '%s' not found"
 	SqlConst_SNoCursor,	"Cursor not returned from Query"
-	SqlConst_SErrorMappingError,	"SQL Error: Error mapping failed"
-	SqlConst_SStoredProcsNotSupported,	"Stored Procedures not supported by '%s' Server"
-	SqlConst_SPackagesNotSupported,	"Packages are not supported by '%s' Server"
 	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"
@@ -1914,12 +1914,12 @@ BEGIN
 	DBXCommon_SInvalidOrdinal,	"Invalid Ordinal:  %d"
 	DBXCommon_SDefaultErrorMessage,	"DBX Error:  %s"
 	DBXCommon_SAlreadyPrepared,	"Command can only be prepared once"
+	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"
 	bdeconst_SNoCachedUpdates,	"Not in cached update mode"
 	bdeconst_SInvalidAliasName,	"Invalid alias name %s"
 	bdeconst_SNoFieldAccess,	"Cannot access field '%s' in a filter"
@@ -1968,27 +1968,38 @@ BEGIN
 	bdeconst_SInvalidSessionName,	"Invalid session name %s"
 	bdeconst_SDatabaseNameMissing,	"Database name missing"
 	bdeconst_SSessionNameMissing,	"Session name missing"
-	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_SIB80feature,	"%s is an InterBase 2007 function. Please upgrade to InterBase 2007 to use this functonality"
+	IBSQLMonitor_StrFetch,	": [Fetch] "
+	IBSQLMonitor_StrPrepare,	": [Prepare] "
+	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: "
 	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"
 	ADOConst_SMissingCommandText,	"Missing %s property"
 	ADOConst_SNoResultSet,	"CommandText does not return a result set"
 	ADOConst_SADOCreateError,	"Error creating object.  Please verify that the Microsoft Data Access Components 2.1 (or later) have been properly installed"
-	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_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_StrConnect,	": [Connect]"
+	IBSQLMonitor_StrDisconnect,	": [Disconnect]"
+	IBSQLMonitor_StrMisc,	"[Misc] "
+	IBSQLMonitor_StrError,	"[Error] "
+	IBSQLMonitor_StrAttach,	": [Attach]"
+	IBSQLMonitor_StrDetach,	": [Detach]"
+	IBSQLMonitor_StrQuery,	": [Query]"
+	IBSQLMonitor_StrStart,	": [Start]"
+	IBSQLMonitor_StrExecute,	": [Execute] "
+	IBSQLMonitor_StrNULL,	"<NULL>"
+	IBSQLMonitor_StrBLOB,	"<BLOB>"
 	IBXConst_SNoOptionsSet,	"No Install Options selected"
 	IBXConst_SNoDestinationDirectory,	"DestinationDirectory is not set"
 	IBXConst_SNosourceDirectory,	"SourceDirectory is not set"
@@ -2000,11 +2011,11 @@ BEGIN
 	IBXConst_SInvalidOnStatusResult,	"Unexpected onStatus return value"
 	IBXConst_SDPBConstantUnknownEx,	"DPB Constant (%s) is unknown"
 	IBXConst_STPBConstantUnknownEx,	"TPB Constant (%s) is unknown"
-	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_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_SSPBConstantUnknown,	"SPB Constant Unknown"
 	IBXConst_SServiceActive,	"Cannot perform operation -- service is not attached"
 	IBXConst_SServiceInActive,	"Cannot perform operation -- service is attached"
@@ -2016,11 +2027,11 @@ BEGIN
 	IBXConst_SSQLMonitorAlreadyPresent,	"SQL Monitor Instance is already present"
 	IBXConst_SCantPrintValue,	"Cannot print value"
 	IBXConst_SEOFReached,	"SEOFReached"
-	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_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_SNoProvider,	"No Provider"
 	IBXConst_SNoRecordsAffected,	"No Records Affected"
 	IBXConst_SNoTableName,	"No Table Name assigned"
@@ -2032,11 +2043,11 @@ BEGIN
 	IBXConst_SInvalidEvent,	"Invalid Event"
 	IBXConst_SMaximumEvents,	"Exceded Maximum Event limits"
 	IBXConst_SNoEventsRegistered,	"No Events Registered"
-	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_SInvalidQueueing,	"Invalid Queueing"
+	IBXConst_SInvalidRegistration,	"Invalid Registration"
+	IBXConst_SInvalidBatchMove,	"Invalid Batch Move"
+	IBXConst_SSQLDialectInvalid,	"SQL Dialect Invalid"
+	IBXConst_SSPBConstantNotSupported,	"SPB Constant Not supported"
 	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])"
@@ -2048,11 +2059,11 @@ BEGIN
 	IBXConst_SEmptySQLStatement,	"Empty SQL Statement"
 	IBXConst_SIsASelectStatement,	"use Open for a Select Statement"
 	IBXConst_SRequiredParamNotSet,	"Required Param value not set"
-	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_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_SBlobCannotBeWritten,	"Blob stream cannot be written"
 	IBXConst_SEmptyQuery,	"Empty query"
 	IBXConst_SCannotOpenNonSQLSelect,	"Cannot \"open\" a non-select statement. Use ExecQuery"
@@ -2064,11 +2075,11 @@ BEGIN
 	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_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_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_STransactionNotAssigned,	"Transaction not assigned"
 	IBXConst_SXSQLDAIndexOutOfRange,	"XSQLDA index out of range"
 	IBXConst_SXSQLDANameDoesNotExist,	"XSQLDA name does not exist (%s)"
@@ -2080,11 +2091,11 @@ BEGIN
 	IBXConst_SDatasetOpen,	"Dataset open"
 	IBXConst_SDatasetClosed,	"Dataset closed"
 	IBXConst_SUnknownSQLDataType,	"Unknown SQL Data type (%d)"
-	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_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_SCannotSetTransaction,	"Cannot set transaction"
 	IBXConst_SOperationCancelled,	"Operation cancelled at user's request"
 	IBXConst_SDPBConstantNotSupported,	"DPB Constant (isc_dpb_%s) is unsupported"
@@ -2096,22 +2107,11 @@ BEGIN
 	IBXConst_SDatabaseNameMissing,	"Database name is missing"
 	IBXConst_SNotInTransaction,	"Transaction is not active"
 	IBXConst_SInTransaction,	"Transaction is active"
-	IBSQLMonitor_StrNULL,	"<NULL>"
-	IBSQLMonitor_StrBLOB,	"<BLOB>"
-	IBSQLMonitor_StrFetch,	": [Fetch] "
-	IBSQLMonitor_StrPrepare,	": [Prepare] "
-	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_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"
 	VDBConsts_SInsertRecord,	"Insert record"
 	VDBConsts_SDeleteRecord,	"Delete record"
 	VDBConsts_SEditRecord,	"Edit record"
@@ -2119,15 +2119,15 @@ BEGIN
 	VDBConsts_SCancelEdit,	"Cancel edit"
 	VDBConsts_SRefreshRecord,	"Refresh data"
 	VDBConsts_SRemoteLogin,	"Remote Login"
-	IBSQLMonitor_StrConnect,	": [Connect]"
-	IBSQLMonitor_StrDisconnect,	": [Disconnect]"
-	IBSQLMonitor_StrMisc,	"[Misc] "
-	IBSQLMonitor_StrError,	"[Error] "
-	IBSQLMonitor_StrAttach,	": [Attach]"
-	IBSQLMonitor_StrDetach,	": [Detach]"
-	IBSQLMonitor_StrQuery,	": [Query]"
-	IBSQLMonitor_StrStart,	": [Start]"
-	IBSQLMonitor_StrExecute,	": [Execute] "
+	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"
 	uDARes_err_CannotFindDefaultItem,	"Cannot find default %s"
 	uDARes_err_PoolIsNotEmpty,	"Cannot perform this operation when connections are pooled"
 	uDARes_err_MaxPoolSizeReached,	"Maximum pool size reached. Cannot create a new connection"
@@ -2400,59 +2400,6 @@ BEGIN
 	JConsts_sJPEGImageFile,	"JPEG Image File"
 	JclResources_RsCannotCreateDir,	"Unable to create directory"
 	JclResources_RsFileUtilsNoVersionInfo,	"File contains no version information"
-	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_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."
-	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"
-	IdResourceStringsProtocols_RSHTTPRequestTimeout,	"Request Timeout"
-	IdResourceStringsProtocols_RSHTTPConflict,	"Conflict"
-	IdResourceStringsProtocols_RSHTTPGone,	"Gone"
-	IdResourceStringsProtocols_RSHTTPLengthRequired,	"Length Required"
-	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"
-	IdResourceStringsProtocols_RSHTTPNonAuthoritativeInformation,	"Non-authoritative Information"
-	IdResourceStringsProtocols_RSHTTPNoContent,	"No Content"
-	IdResourceStringsProtocols_RSHTTPResetContent,	"Reset Content"
-	IdResourceStringsProtocols_RSHTTPPartialContent,	"Partial Content"
-	IdResourceStringsCore_RSNotEnoughDataInBuffer,	"Not enough data in buffer."
-	IdResourceStringsCore_RSTooMuchDataInBuffer,	"Too much data in buffer."
-	IdResourceStringsCore_RSFileNotFound,	"File \"%s\" not found"
-	IdResourceStringsCore_RSNotConnected,	"Not Connected"
-	IdResourceStringsCore_RSObjectTypeNotSupported,	"Object type not supported."
 	IdResourceStringsCore_RSIdNoDataToRead,	"No data to read."
 	IdResourceStringsCore_RSReadTimeout,	"Read Timeout"
 	IdResourceStringsCore_RSReadLnMaxLineLengthExceeded,	"Max line length exceeded."
@@ -2464,11 +2411,11 @@ BEGIN
 	IdResourceStringsCore_RSTransparentProxyCannotBind,	"Transparent proxy cannot bind."
 	IdResourceStringsCore_RSTransparentProxyCanNotSupportUDP,	"UDP Not supported by this proxy."
 	IdResourceStringsCore_RSBufferMissingTerminator,	"Buffer terminator must be specified."
-	IdResourceStringsCore_RSSocksRequestFailed,	"Request rejected or failed."
-	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."
-	IdResourceStringsCore_RSSocksServerRespondError,	"Socks server did not respond."
+	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."
 	IdResourceStringsCore_RSSocksAuthMethodError,	"Invalid socks authentication method."
 	IdResourceStringsCore_RSSocksAuthError,	"Authentication error to socks server."
 	IdResourceStringsCore_RSSocksServerGeneralError,	"General SOCKS server failure."
@@ -2480,6 +2427,59 @@ BEGIN
 	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"
+	IdResourceStringsCore_RSObjectTypeNotSupported,	"Object type not supported."
+	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."
+	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."
+	IdResourceStringsCore_RSSocksServerRespondError,	"Socks server did not respond."
+	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"
+	IdResourceStringsProtocols_RSHTTPRequestURITooLong,	"Request-URI Too Long. 256 Chars max"
+	IdResourceStringsProtocols_RSHTTPUnsupportedMediaType,	"Unsupported Media Type"
+	IdResourceStringsProtocols_RSHTTPInternalServerError,	"Internal Server Error"
+	IdResourceStringsProtocols_RSHTTPNotImplemented,	"Not Implemented"
+	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"
+	IdResourceStringsProtocols_RSHTTPSeeOther,	"See Other"
+	IdResourceStringsProtocols_RSHTTPNotModified,	"Not Modified"
+	IdResourceStringsProtocols_RSHTTPUseProxy,	"Use Proxy"
+	IdResourceStringsProtocols_RSHTTPBadRequest,	"Bad Request"
 	IdResourceStrings_RSStackClassUndefined,	"Stack Class is undefined."
 	IdResourceStrings_RSStackAlreadyCreated,	"Stack already created."
 	IdResourceStrings_RSAntiFreezeOnlyOne,	"Only one TIdAntiFreeze can exist per application."
@@ -2495,7 +2495,7 @@ BEGIN
 	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."
+	IdResourceStringsProtocols_RSMIMEExtensionEmpty,	"Extension is empty"
 	IdResourceStrings_RSStackENETRESET,	"Net dropped connection or reset."
 	IdResourceStrings_RSStackECONNABORTED,	"Software caused connection abort."
 	IdResourceStrings_RSStackECONNRESET,	"Connection reset by peer."
@@ -2608,7 +2608,7 @@ BEGIN
 	DBConsts_SCircularDataLink,	"Circular datalinks are not allowed"
 	DBConsts_SLookupInfoError,	"Lookup information for field '%s' is incomplete"
 	DBConsts_SDataSourceChange,	"DataSource cannot be changed"
-	uRODECConst_sNotInitialized,	"%s is not initialized, call Init() or InitKey() first."
+	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"
@@ -2624,30 +2624,6 @@ BEGIN
 	DBConsts_SInvalidFloatValue,	"'%s' is not a valid floating point value for field '%s'"
 	DBConsts_SFieldTypeMismatch,	"Type mismatch for field '%s', expecting: %s actual: %s"
 	DBConsts_SFieldSizeMismatch,	"Size mismatch for field '%s', expecting: %d actual: %d"
-	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"
-	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"
-	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."
-	uRORes_err_UnexpectedClassInStream,	"Unexpected class found in stream; class \"%s\" does not descend from \"%s\"."
 	uRORes_err_SessionNotFound,	"Session %s could not be found"
 	uRORes_err_ChannelDoesntSupportIROMetadataReader,	"Channel does not support IROMetadataReader"
 	uRORes_err_TooManySessions,	"Too many sessions. Try again in %d minute(s)"
@@ -2656,14 +2632,14 @@ BEGIN
 	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_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_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\""
-	uRORes_err_ParameterNotFound,	"Parameter \"%s\" was not found"
+	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"
+	ComConst_SOleError,	"OLE error %.8x"
+	ComConst_SNoMethod,	"Method '%s' not supported by automation object"
+	ComConst_SVarNotObject,	"Variant does not reference an automation object"
 	uRORes_err_TypeNotSupported,	"Type \"%s\" not supported"
 	uRORes_err_ClassFactoryNotFound,	"Class factory for interface %s not found"
 	uRORes_err_IROMessageNotSupported,	"Class \"%s\" does not support IROMessage"
@@ -2672,14 +2648,14 @@ BEGIN
 	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_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_UnexpectedEndOfStream,	"Unexpected end of stream."
-	uRORes_err_RodlDuplicateName,	"Duplicate name."
-	uRORes_err_RodlNoDataTypeSpecified,	"No data type specified."
-	uRORes_err_RodlNoEnumValues,	"Enum does not contain any values."
+	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."
+	uRORes_err_UnexpectedClassInStream,	"Unexpected class found in stream; class \"%s\" does not descend from \"%s\"."
 	uRORes_err_RodlNoStructElementsDefined,	"Struct does not contain any elements."
 	uRORes_err_RodlNoOperationsDefined,	"Service interface does not contain any elements."
 	uRORes_err_RodlUsedFileDoesNotExist,	"The referenced RODL file \"%s\" could not be found."
@@ -2688,6 +2664,30 @@ BEGIN
 	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_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\""
+	uRORes_err_ParameterNotFound,	"Parameter \"%s\" was not found"
+	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\""
+	uRORes_err_UnexpectedEndOfStream,	"Unexpected end of stream."
+	uRORes_err_RodlDuplicateName,	"Duplicate name."
+	uRORes_err_RodlNoDataTypeSpecified,	"No data type specified."
+	uRORes_err_RodlNoEnumValues,	"Enum does not contain any values."
 	Consts_SUnicodeEncoding,	"Unicode"
 	Consts_SBigEndianEncoding,	"Big Endian Unicode"
 	Consts_SUTF8Encoding,	"UTF-8"
@@ -2696,14 +2696,14 @@ 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"
-	uRORes_err_InvalidIndex,	"Invalid index %d"
-	uRORes_err_InvalidType,	"Invalid type \"%s. Expected \"%s\"\""
-	uRORes_err_InvalidLibrary,	"Invalid library"
-	uRORes_err_InvalidStream,	"Invalid stream"
+	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"
+	uRODECConst_sFMT_MIME64,	"MIME Base 64"
 	Consts_SNoDefaultPrinter,	"There is no default printer currently selected"
 	Consts_SDuplicateMenus,	"Menu '%s' is already being used by another form"
 	Consts_SPictureLabel,	"Picture:"
@@ -2978,48 +2978,48 @@ 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\JVCL\JvConsts.res */
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\WindowsXP.res */
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\DBPWDlg.dfm */
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\DBLogDlg.dfm */
-/* C:\Archivos de programa\CodeGear\RAD Studio\5.0\Lib\dbctrls.res */
-/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\uDAReconcileDialogDetails.dfm */
-/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\uDAReconcileDialog.dfm */
-/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\DataAbstract_IBXDriver_Glyphs.res */
-/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\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:\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:\archivos de programa\codegear\rad studio\5.0\lib\DBPWDlg.dfm */
+/* c:\archivos de programa\codegear\rad studio\5.0\lib\DBLogDlg.dfm */
+/* c:\archivos de programa\codegear\rad studio\5.0\lib\DBCtrls.res */
+/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\uDAReconcileDialogDetails.dfm */
+/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\uDAReconcileDialog.dfm */
+/* 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:\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\Lib\SDAC\DBAccess.res */
-/* C:\Varela_D2007\Lib\RemObjects\Data_Abstract\DataAbstract_SDACDriver_Glyphs.res */
+/* C:\Archivos de programa\RemObjects Software\Data Abstract for Delphi\Source\Drivers\DataAbstract_SDACDriver_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\JvToolEdit.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_Log_Impl.dfm */
@@ -3045,5 +3045,5 @@ END
 /* C:\Varela_D2007\Source\Modulos\Stock\Servidor\srvStock_Impl.dfm */
 /* C:\Varela_D2007\Source\Modulos\Parametros\Servidor\srvParametros_Impl.dfm */
 /* C:\Varela_D2007\Source\Servidor\AdminPV_Server.res */
-/* C:\Varela_D2007\Source\Servidor\RODLFILE.res */
-/* C:\DOCUME~1\Usuario\CONFIG~1\Temp\dtf8.tmp */
+/* C:\Varela_D2007\Source\Servidor\RODLFile.res */
+/* C:\Varela_D2007\Source\Servidor\AdminPV_Server.drf */
diff --git a/Source/Servidor/EDI_Inventary_Impl.pas b/Source/Servidor/EDI_Inventary_Impl.pas
index ddfe738..c762386 100644
--- a/Source/Servidor/EDI_Inventary_Impl.pas
+++ b/Source/Servidor/EDI_Inventary_Impl.pas
@@ -46,7 +46,8 @@ function TEDI_Inventary.CargarFicheroEDI(const FicheroCAB: String; const Fichero
 var
   ADirEntrada : String;
   ADirTemp : String;
-  NumRegNuevos : Integer;  
+  NumRegNuevos : Integer;
+  bCargarFicheros: Boolean;
 
   procedure GuardarFicheros;
   var
@@ -84,9 +85,25 @@ begin
     try
       if not DirectoryExists(ADirTemp) then
         ForceDirectories(ADirTemp);
-      FileMove(ADirEntrada + FicheroCAB, ADirTemp + FicheroCAB);
-      FileMove(ADirEntrada + FicheroLIN, ADirTemp + FicheroLIN);
-      FileMove(ADirEntrada + FicheroCANT, ADirTemp + FicheroCANT);
+
+      if not FileMove(ADirEntrada + FicheroCAB, ADirTemp + FicheroCAB) then
+      begin
+         MsgError := 'No se ha podido mover FicheroCAB';
+         bCargarFicheros := False;
+      end;
+
+      if not FileMove(ADirEntrada + FicheroLIN, ADirTemp + FicheroLIN) then
+      begin
+         MsgError := 'No se ha podido mover FicheroLIN';
+         bCargarFicheros := False;
+      end;
+
+      if not FileMove(ADirEntrada + FicheroCANT, ADirTemp + FicheroCANT) then
+      begin
+         MsgError := 'No se ha podido mover FicheroCANT';
+         bCargarFicheros := False;
+      end;
+
     except
       on E: Exception do
       begin
@@ -97,17 +114,22 @@ begin
     end;
 
     try
-      try
-        dmEDIInventary.CargarFicheros (ADirTemp + FicheroCAB, ADirTemp + FicheroLIN, ADirTemp + FicheroCANT, NumRegNuevos);
-        if NumRegNuevos > 0 then
-          InsertarLog(True, Format('Se han cargado %d registros de inventario nuevos', [NumRegNuevos]))
-        else
-          InsertarLog(True, 'El fichero se ha cargado pero no hay registros de inventario nuevos');
-        Result := True;
-      finally
-        GuardarFicheros;
-        dmServer.BorrarFicherosDeCargaAntiguos;        
-      end;
+      if bCargarFicheros then
+      begin
+        try
+          dmEDIInventary.CargarFicheros (ADirTemp + FicheroCAB, ADirTemp + FicheroLIN, ADirTemp + FicheroCANT, NumRegNuevos);
+          if NumRegNuevos > 0 then
+            InsertarLog(True, Format('Se han cargado %d registros de inventario nuevos', [NumRegNuevos]))
+          else
+            InsertarLog(True, 'El fichero se ha cargado pero no hay registros de inventario nuevos');
+          Result := True;
+        finally
+          GuardarFicheros;
+          dmServer.BorrarFicherosDeCargaAntiguos;
+        end;
+      end
+      else
+        InsertarLog(False, MsgError + ' (CargarFicheroEDI3 INV)');
     except
       on E: Exception do
       begin
diff --git a/Source/Servidor/EDI_Sales_Impl.pas b/Source/Servidor/EDI_Sales_Impl.pas
index 3ebcc7e..0b26f28 100644
--- a/Source/Servidor/EDI_Sales_Impl.pas
+++ b/Source/Servidor/EDI_Sales_Impl.pas
@@ -47,6 +47,7 @@ var
   ADirEntrada : String;
   ADirTemp : String;
   NumRegNuevos : Integer;
+  bCargarFicheros: Boolean;
 
   procedure GuardarFicheros;
   var
@@ -68,7 +69,7 @@ var
 begin
   Result := False;
   NumRegNuevos := 0;
-  
+
   // Hay que comprobar que existen los ficheros.
   ADirEntrada := PathAddSeparator(dmServer.FDirEntrada);
 
@@ -86,10 +87,32 @@ begin
     try
       if not DirectoryExists(ADirTemp) then
         ForceDirectories(ADirTemp);
-      FileMove(ADirEntrada + FicheroCAB, ADirTemp + FicheroCAB);
-      FileMove(ADirEntrada + FicheroLUG, ADirTemp + FicheroLUG);
-      FileMove(ADirEntrada + FicheroART, ADirTemp + FicheroART);
-      FileMove(ADirEntrada + FicheroART, ADirTemp + 'CONVEN.TXT');
+
+      bCargarFicheros := True;
+      if not FileMove(ADirEntrada + FicheroCAB, ADirTemp + FicheroCAB) then
+      begin
+         MsgError := 'No se ha podido mover FicheroCAB';
+         bCargarFicheros := False;
+      end;
+
+      if not FileMove(ADirEntrada + FicheroLUG, ADirTemp + FicheroLUG) then
+      begin
+         MsgError := 'No se ha podido mover FicheroLUG';
+         bCargarFicheros := False;
+      end;
+
+      if not FileMove(ADirEntrada + FicheroART, ADirTemp + FicheroART) then
+      begin
+         MsgError := 'No se ha podido mover FicheroART';
+         bCargarFicheros := False;
+      end;
+
+//      if not FileMove(ADirEntrada + FicheroART, ADirTemp + 'CONVEN.TXT') then
+//      begin
+//         MsgError := 'No se ha podido mover FicheroCONVEN';
+//         bCargarFicheros := False;
+//      end;
+
     except
       on E: Exception do
       begin
@@ -100,17 +123,22 @@ begin
     end;
 
     try
-      try
-        dmEDISales.CargarFicheros (ADirTemp + FicheroCAB, ADirTemp + FicheroLUG, ADirTemp + FicheroART, NumRegNuevos);
-        if NumRegNuevos > 0 then
-          InsertarLog(True, Format('Se han cargado %d registros de ventas nuevos', [NumRegNuevos]))
-        else
-          InsertarLog(True, 'El fichero se ha cargado pero no hay registros de ventas nuevos'); 
-        Result := True;
-      finally
-        GuardarFicheros;
-        dmServer.BorrarFicherosDeCargaAntiguos;
-      end;
+      if bCargarFicheros then
+      begin
+        try
+          dmEDISales.CargarFicheros (ADirTemp + FicheroCAB, ADirTemp + FicheroLUG, ADirTemp + FicheroART, NumRegNuevos);
+          if NumRegNuevos > 0 then
+            InsertarLog(True, Format('Se han cargado %d registros de ventas nuevos', [NumRegNuevos]))
+          else
+            InsertarLog(True, 'El fichero se ha cargado pero no hay registros de ventas nuevos');
+          Result := True;
+        finally
+          GuardarFicheros;
+          dmServer.BorrarFicherosDeCargaAntiguos;
+        end;
+      end
+      else
+        InsertarLog(False, MsgError + ' (CargarFicheroEDI3 SLS)');
     except
       on E: Exception do
       begin