SVN Commit by dpage: r4262 - trunk/pgadmin3/pkg/win32/src

Author: dpage
Date: 2005-05-28 22:07:28 +0100 (Sat, 28 May 2005)
New Revision: 4262

Modified:
trunk/pgadmin3/pkg/win32/src/i18ndata.wxs
trunk/pgadmin3/pkg/win32/src/i18nrefs.wxs
trunk/pgadmin3/pkg/win32/src/pgadmin3.wxs
trunk/pgadmin3/pkg/win32/src/ui.wxs
trunk/pgadmin3/pkg/win32/src/uidata.wxs
Log:
Don't use the component GUID in file IDs because they all get changed when Make REGENGUIDS is run, resulting in shortcuts that link to non-existant files.

Modified: trunk/pgadmin3/pkg/win32/src/i18ndata.wxs
===================================================================
--- trunk/pgadmin3/pkg/win32/src/i18ndata.wxs 2005-05-27 16:21:53 UTC (rev 4261)
+++ trunk/pgadmin3/pkg/win32/src/i18ndata.wxs 2005-05-28 21:07:28 UTC (rev 4262)
@@ -1,143 +1,143 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Include>

<Directory Id="i18n_af_ZA" Name="af_ZA">
<Component Id="i18n_af_ZA" Guid="D57117B0-4064-44A2-A608-1E50F30FD31B">
- <File Id="pgadmin3.mo.778895D5-E05A-42CE-BB05-CBCA6369C0AE" Name="pgadmin3.mo" DiskId="1" src="../../i18n/af_ZA/pgadmin3.mo" />
- <File Id="wxstd.mo.9AB7ABE2-C2DC-421B-892A-A5FFBDD4C803" Name="wxstd.mo" DiskId="1" src="../../i18n/af_ZA/wxstd.mo" />
+ <File Id="i18n_af_ZA.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/af_ZA/pgadmin3.mo" />
+ <File Id="i18n_af_ZA.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/af_ZA/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_ar_SA" Name="ar_SA">
<Component Id="i18n_ar_SA" Guid="14C88EB2-9ABA-42A0-9935-8B078C1AFDFE">
- <File Id="pgadmin3.mo.0AC3716E-D4EC-446E-AF01-5C0DD37FD6DA" Name="pgadmin3.mo" DiskId="1" src="../../i18n/ar_SA/pgadmin3.mo" />
+ <File Id="i18n_ar_SA.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/ar_SA/pgadmin3.mo" />
</Component>
</Directory>
<Directory Id="i18n_ca_ES" Name="ca_ES">
<Component Id="i18n_ca_ES" Guid="A04436F1-073E-4434-88C0-97C0BE43EECD">
- <File Id="pgadmin3.mo.74AF5C95-D99A-47B1-8B9C-53B482D35529" Name="pgadmin3.mo" DiskId="1" src="../../i18n/ca_ES/pgadmin3.mo" />
- <File Id="wxstd.mo.581B518C-2CF7-46FC-9EBA-4EF4FCCA6D35" Name="wxstd.mo" DiskId="1" src="../../i18n/ca_ES/wxstd.mo" />
+ <File Id="i18n_ca_ES.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/ca_ES/pgadmin3.mo" />
+ <File Id="i18n_ca_ES.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/ca_ES/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_da_DK" Name="da_DK">
<Component Id="i18n_da_DK" Guid="5747D673-4230-41D7-9738-C4B11A265C03">
- <File Id="pgadmin3.mo.1EB5B5FD-F2D0-4522-A40F-6B9148D8A387" Name="pgadmin3.mo" DiskId="1" src="../../i18n/da_DK/pgadmin3.mo" />
- <File Id="wxstd.mo.3DDEA03F-6606-4FBD-AC57-E6082AF152F1" Name="wxstd.mo" DiskId="1" src="../../i18n/da_DK/wxstd.mo" />
+ <File Id="i18n_da_DK.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/da_DK/pgadmin3.mo" />
+ <File Id="i18n_da_DK.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/da_DK/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_de_DE" Name="de_DE">
<Component Id="i18n_de_DE" Guid="70924031-398F-4B58-ABB4-603CAA1FC05D">
- <File Id="pgadmin3.mo.E0734C9F-BBE1-4030-A6CF-8413B5C8ECEF" Name="pgadmin3.mo" DiskId="1" src="../../i18n/de_DE/pgadmin3.mo" />
- <File Id="wxstd.mo.86093BDC-4D2B-426C-9287-93361A172DF0" Name="wxstd.mo" DiskId="1" src="../../i18n/de_DE/wxstd.mo" />
+ <File Id="i18n_de_DE.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/de_DE/pgadmin3.mo" />
+ <File Id="i18n_de_DE.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/de_DE/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_el_GR" Name="el_GR">
<Component Id="i18n_el_GR" Guid="5D6FA5BB-04B9-47FC-BE2E-3C35F3BA3398">
- <File Id="pgadmin3.mo.2FB73201-1F4E-4C7D-9393-E0F4135D7928" Name="pgadmin3.mo" DiskId="1" src="../../i18n/el_GR/pgadmin3.mo" />
- <File Id="wxstd.mo.FFADEAC9-C991-446D-BC6F-B9F4DA0206C9" Name="wxstd.mo" DiskId="1" src="../../i18n/el_GR/wxstd.mo" />
+ <File Id="i18n_el_GR.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/el_GR/pgadmin3.mo" />
+ <File Id="i18n_el_GR.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/el_GR/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_es_ES" Name="es_ES">
<Component Id="i18n_es_ES" Guid="45A9E478-71C6-42C9-8082-AC4119376A65">
- <File Id="pgadmin3.mo.277C2CBD-3FA5-485E-9EF2-91FD13324FC9" Name="pgadmin3.mo" DiskId="1" src="../../i18n/es_ES/pgadmin3.mo" />
- <File Id="wxstd.mo.9C2F55A4-1B7B-4B53-AE53-724EA190A2CB" Name="wxstd.mo" DiskId="1" src="../../i18n/es_ES/wxstd.mo" />
+ <File Id="i18n_es_ES.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/es_ES/pgadmin3.mo" />
+ <File Id="i18n_es_ES.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/es_ES/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_fi_FI" Name="fi_FI">
<Component Id="i18n_fi_FI" Guid="F2AE20BA-B2CB-4491-8EC6-3C058CEBF3BA">
- <File Id="pgadmin3.mo.0917DE8A-3977-48F8-BA8E-37400440B708" Name="pgadmin3.mo" DiskId="1" src="../../i18n/fi_FI/pgadmin3.mo" />
- <File Id="wxstd.mo.F2299194-E717-46E7-9B08-07068B009023" Name="wxstd.mo" DiskId="1" src="../../i18n/fi_FI/wxstd.mo" />
+ <File Id="i18n_fi_FI.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/fi_FI/pgadmin3.mo" />
+ <File Id="i18n_fi_FI.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/fi_FI/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_fr_FR" Name="fr_FR">
<Component Id="i18n_fr_FR" Guid="DFFCEFD9-4C35-4D83-84D8-EBCDF53A0918">
- <File Id="pgadmin3.mo.D9926DC9-2E28-4CA4-B2C2-0A90247C0C24" Name="pgadmin3.mo" DiskId="1" src="../../i18n/fr_FR/pgadmin3.mo" />
- <File Id="wxstd.mo.A3A4168D-6B70-48A3-810B-A3E9A766AD51" Name="wxstd.mo" DiskId="1" src="../../i18n/fr_FR/wxstd.mo" />
+ <File Id="i18n_fr_FR.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/fr_FR/pgadmin3.mo" />
+ <File Id="i18n_fr_FR.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/fr_FR/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_hu_HU" Name="hu_HU">
<Component Id="i18n_hu_HU" Guid="72A2FE2B-B1A0-4D1E-85A3-58E6194D23F5">
- <File Id="pgadmin3.mo.1323B38D-CD91-4E18-83AD-DBDCE1EE418A" Name="pgadmin3.mo" DiskId="1" src="../../i18n/hu_HU/pgadmin3.mo" />
- <File Id="wxstd.mo.C9BC5932-40FD-4098-8B80-81D1BF96418E" Name="wxstd.mo" DiskId="1" src="../../i18n/hu_HU/wxstd.mo" />
+ <File Id="i18n_hu_HU.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/hu_HU/pgadmin3.mo" />
+ <File Id="i18n_hu_HU.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/hu_HU/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_id_ID" Name="id_ID">
<Component Id="i18n_id_ID" Guid="29A923F5-F0C7-443F-B384-35888D98BEA6">
- <File Id="pgadmin3.mo.61C83467-ED39-4D89-A626-05F97A58B1D6" Name="pgadmin3.mo" DiskId="1" src="../../i18n/id_ID/pgadmin3.mo" />
- <File Id="wxstd.mo.AA97E7F6-E926-48E0-BC58-D10F456FBD64" Name="wxstd.mo" DiskId="1" src="../../i18n/id_ID/wxstd.mo" />
+ <File Id="i18n_id_ID.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/id_ID/pgadmin3.mo" />
+ <File Id="i18n_id_ID.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/id_ID/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_it_IT" Name="it_IT">
<Component Id="i18n_it_IT" Guid="E161DD45-4BAD-452F-A1FB-1DBBF43D75C4">
- <File Id="pgadmin3.mo.66B43991-98C9-4B0C-8E0D-CBC6CD3249E2" Name="pgadmin3.mo" DiskId="1" src="../../i18n/it_IT/pgadmin3.mo" />
- <File Id="wxstd.mo.4A5B8C0C-BBE0-40C9-905E-48C0E610B9C6" Name="wxstd.mo" DiskId="1" src="../../i18n/it_IT/wxstd.mo" />
+ <File Id="i18n_it_IT.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/it_IT/pgadmin3.mo" />
+ <File Id="i18n_it_IT.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/it_IT/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_ja_JP" Name="ja_JP">
<Component Id="i18n_ja_JP" Guid="A158CCC8-03B8-4E17-B5E3-7EB66D8E73E1">
- <File Id="pgadmin3.mo.53A59E2C-D03E-477B-B76F-F84EB4E2694A" Name="pgadmin3.mo" DiskId="1" src="../../i18n/ja_JP/pgadmin3.mo" />
- <File Id="wxstd.mo.F5B3CAB3-A583-44A6-9358-F78D4AB238D0" Name="wxstd.mo" DiskId="1" src="../../i18n/ja_JP/wxstd.mo" />
+ <File Id="i18n_ja_JP.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/ja_JP/pgadmin3.mo" />
+ <File Id="i18n_ja_JP.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/ja_JP/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_lv_LV" Name="lv_LV">
<Component Id="i18n_lv_LV" Guid="75821EC1-7688-455A-9101-A217F1518025">
- <File Id="pgadmin3.mo.823AA8B8-1CB8-4388-994D-EEBDB889DFFF" Name="pgadmin3.mo" DiskId="1" src="../../i18n/lv_LV/pgadmin3.mo" />
+ <File Id="i18n_lv_LV.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/lv_LV/pgadmin3.mo" />
</Component>
</Directory>
<Directory Id="i18n_nl_NL" Name="nl_NL">
<Component Id="i18n_nl_NL" Guid="3FC6F591-05E4-4BC8-82E2-43CB89827D22">
- <File Id="pgadmin3.mo.36F64C11-3704-4C40-ACC3-16F6C5B6C687" Name="pgadmin3.mo" DiskId="1" src="../../i18n/nl_NL/pgadmin3.mo" />
- <File Id="wxstd.mo.DC41F322-D5DA-4D3E-AA35-A767552190C9" Name="wxstd.mo" DiskId="1" src="../../i18n/nl_NL/wxstd.mo" />
+ <File Id="i18n_nl_NL.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/nl_NL/pgadmin3.mo" />
+ <File Id="i18n_nl_NL.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/nl_NL/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_pl_PL" Name="pl_PL">
<Component Id="i18n_pl_PL" Guid="DF0B6225-505B-4E61-887D-32964FA26A98">
- <File Id="pgadmin3.mo.04AEB28C-D65F-4C99-BA39-024905902FED" Name="pgadmin3.mo" DiskId="1" src="../../i18n/pl_PL/pgadmin3.mo" />
- <File Id="wxstd.mo.BAFB94E5-27B3-4CA5-B7ED-A9F9A07CD00D" Name="wxstd.mo" DiskId="1" src="../../i18n/pl_PL/wxstd.mo" />
+ <File Id="i18n_pl_PL.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/pl_PL/pgadmin3.mo" />
+ <File Id="i18n_pl_PL.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/pl_PL/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_pt_PT" Name="pt_PT">
<Component Id="i18n_pt_PT" Guid="ED1A9DF8-E6E1-4FA8-BDCE-857EB0FEE09F">
- <File Id="pgadmin3.mo.772BEA07-1920-4018-998D-FBF9BC5B4EAB" Name="pgadmin3.mo" DiskId="1" src="../../i18n/pt_PT/pgadmin3.mo" />
+ <File Id="i18n_pt_PT.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/pt_PT/pgadmin3.mo" />
</Component>
</Directory>
<Directory Id="i18n_ru_RU" Name="ru_RU">
<Component Id="i18n_ru_RU" Guid="C7B35F6D-38C3-4522-AE73-289F0EF28966">
- <File Id="pgadmin3.mo.821E3FD6-6D35-436E-944F-83833FB19EBB" Name="pgadmin3.mo" DiskId="1" src="../../i18n/ru_RU/pgadmin3.mo" />
- <File Id="wxstd.mo.E1AE6D92-C37A-4258-88AE-930C446B7CE0" Name="wxstd.mo" DiskId="1" src="../../i18n/ru_RU/wxstd.mo" />
+ <File Id="i18n_ru_RU.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/ru_RU/pgadmin3.mo" />
+ <File Id="i18n_ru_RU.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/ru_RU/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_sk_SK" Name="sk_SK">
<Component Id="i18n_sk_SK" Guid="BE08DDDB-CD60-403B-824A-E65B751169E4">
- <File Id="pgadmin3.mo.C134E8A5-23CC-46A9-BF0A-13734E2DB503" Name="pgadmin3.mo" DiskId="1" src="../../i18n/sk_SK/pgadmin3.mo" />
+ <File Id="i18n_sk_SK.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/sk_SK/pgadmin3.mo" />
</Component>
</Directory>
<Directory Id="i18n_sl_SI" Name="sl_SI">
<Component Id="i18n_sl_SI" Guid="C73E6A90-0B0D-4ECF-A9F6-7269B6CC21DF">
- <File Id="pgadmin3.mo.67EF83BB-B6C5-4EA7-9188-5597C02EA37B" Name="pgadmin3.mo" DiskId="1" src="../../i18n/sl_SI/pgadmin3.mo" />
- <File Id="wxstd.mo.B5EC4B75-BB25-4E13-B0AD-C26C8886D44C" Name="wxstd.mo" DiskId="1" src="../../i18n/sl_SI/wxstd.mo" />
+ <File Id="i18n_sl_SI.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/sl_SI/pgadmin3.mo" />
+ <File Id="i18n_sl_SI.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/sl_SI/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_sr_YU" Name="sr_YU">
<Component Id="i18n_sr_YU" Guid="F762B4A0-4685-4A80-8753-3256BFF4487A">
- <File Id="pgadmin3.mo.5BFE6CB6-F4B0-463E-85C3-C26219B30EA5" Name="pgadmin3.mo" DiskId="1" src="../../i18n/sr_YU/pgadmin3.mo" />
+ <File Id="i18n_sr_YU.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/sr_YU/pgadmin3.mo" />
</Component>
</Directory>
<Directory Id="i18n_tr_TR" Name="tr_TR">
<Component Id="i18n_tr_TR" Guid="CA9BEAC9-4EC5-4502-95FD-688625E0CAC2">
- <File Id="pgadmin3.mo.507354ED-649D-4B17-8C5F-25A2901C9064" Name="pgadmin3.mo" DiskId="1" src="../../i18n/tr_TR/pgadmin3.mo" />
- <File Id="wxstd.mo.C4671A9B-B0A5-4B2B-901E-BD4DBC568870" Name="wxstd.mo" DiskId="1" src="../../i18n/tr_TR/wxstd.mo" />
+ <File Id="i18n_tr_TR.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/tr_TR/pgadmin3.mo" />
+ <File Id="i18n_tr_TR.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/tr_TR/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_zh_CN" Name="zh_CN">
<Component Id="i18n_zh_CN" Guid="A07BDC01-EDAB-4582-B752-622F2C57617A">
- <File Id="pgadmin3.mo.A463F3B8-E360-43D8-8D7D-CE0B429FE758" Name="pgadmin3.mo" DiskId="1" src="../../i18n/zh_CN/pgadmin3.mo" />
- <File Id="wxstd.mo.AA817BC6-F4C1-429C-8525-865ECD7DDF7F" Name="wxstd.mo" DiskId="1" src="../../i18n/zh_CN/wxstd.mo" />
+ <File Id="i18n_zh_CN.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/zh_CN/pgadmin3.mo" />
+ <File Id="i18n_zh_CN.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/zh_CN/wxstd.mo" />
</Component>
</Directory>
<Directory Id="i18n_zh_TW" Name="zh_TW">
<Component Id="i18n_zh_TW" Guid="F04AC409-AF3B-4DB9-9AEA-25AC8ACC6018">
- <File Id="pgadmin3.mo.E467368E-1188-4E15-8157-23066E09D2EA" Name="pgadmin3.mo" DiskId="1" src="../../i18n/zh_TW/pgadmin3.mo" />
- <File Id="wxstd.mo.BACA197B-49DF-41EE-BC14-3BE1D986D12B" Name="wxstd.mo" DiskId="1" src="../../i18n/zh_TW/wxstd.mo" />
+ <File Id="i18n_zh_TW.pgadmin3.mo" Name="pgadmin3.mo" DiskId="1" src="../../i18n/zh_TW/pgadmin3.mo" />
+ <File Id="i18n_zh_TW.wxstd.mo" Name="wxstd.mo" DiskId="1" src="../../i18n/zh_TW/wxstd.mo" />
</Component>
</Directory>

Modified: trunk/pgadmin3/pkg/win32/src/i18nrefs.wxs
===================================================================
--- trunk/pgadmin3/pkg/win32/src/i18nrefs.wxs 2005-05-27 16:21:53 UTC (rev 4261)
+++ trunk/pgadmin3/pkg/win32/src/i18nrefs.wxs 2005-05-28 21:07:28 UTC (rev 4262)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Include>
<ComponentRef Id="i18n_af_ZA" />
<ComponentRef Id="i18n_ar_SA" />

Modified: trunk/pgadmin3/pkg/win32/src/pgadmin3.wxs
===================================================================
--- trunk/pgadmin3/pkg/win32/src/pgadmin3.wxs 2005-05-27 16:21:53 UTC (rev 4261)
+++ trunk/pgadmin3/pkg/win32/src/pgadmin3.wxs 2005-05-28 21:07:28 UTC (rev 4262)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">

<!-- Product details -->
@@ -30,38 +30,38 @@
<Directory Id="VERSIONDIR" Name="$(var.VERSION)">

<Component Id="core_libs" Guid="AFEC279C-29A4-402D-8BDD-DC544312579F">
- <File Id="libeay32.dll.48AF6CC8-6B48-48E3-B9FE-819D987803AF" Name="libeay32.dll" DiskId="1" src="$(var.SYSTEM32DIR)/libeay32.dll" />
- <File Id="libiconv-2.dll.03AACBE3-6E3D-4A5C-A2FB-03641025C23C" Name="libico~1.dll" LongName="libiconv-2.dll" DiskId="1" src="$(var.SYSTEM32DIR)/libiconv-2.dll" />
- <File Id="libintl-2.dll.1B794047-1C48-4F04-9752-80806C930AE7" Name="libint~1.dll" LongName="libintl-2.dll" DiskId="1" src="$(var.SYSTEM32DIR)/libintl-2.dll" />
- <File Id="libpq.dll.DCA3BA4B-0052-4160-9D4F-6B3656192E39" Name="libpq.dll" DiskId="1" src="$(var.SYSTEM32DIR)/libpq.dll" />
- <File Id="ssleay32.dll.8B8E50E5-2A6B-4CEC-8DA8-5A728EEE1E3E" Name="ssleay32.dll" DiskId="1" src="$(var.SYSTEM32DIR)/ssleay32.dll" />
+ <File Id="core_libs.libeay32.dll" Name="libeay32.dll" DiskId="1" src="$(var.SYSTEM32DIR)/libeay32.dll" />
+ <File Id="core_libs.libiconv-2.dll" Name="libico~1.dll" LongName="libiconv-2.dll" DiskId="1" src="$(var.SYSTEM32DIR)/libiconv-2.dll" />
+ <File Id="core_libs.libintl-2.dll" Name="libint~1.dll" LongName="libintl-2.dll" DiskId="1" src="$(var.SYSTEM32DIR)/libintl-2.dll" />
+ <File Id="core_libs.libpq.dll" Name="libpq.dll" DiskId="1" src="$(var.SYSTEM32DIR)/libpq.dll" />
+ <File Id="core_libs.ssleay32.dll" Name="ssleay32.dll" DiskId="1" src="$(var.SYSTEM32DIR)/ssleay32.dll" />
</Component>

<Component Id="pgadmin_exes" Guid="3F617C40-4FAF-4C46-BEDE-AE7A16E24F61">
- <File Id="pgadmin3.exe.EF63A6E9-AA1C-4EA8-854D-95846DF177C9" Name="pgadmin3.exe" DiskId="1" src="../../src/Release/pgAdmin3.exe" />
- <Shortcut Id="pgadmin3.exe.CC2D2AB6-849E-4cca-A2B1-ED6C9FB8D222" Directory="SMDIR" Name="pgAdmin3" LongName="$(var.APPNAME)" Target="[#pgadmin3.exe.B40FECF2-DA20-4AEF-916D-442A0535A20C]" Description="pgAdmin III - PostgreSQL Tools" Show="normal" />
+ <File Id="pgadmin_exes.pgadmin3.exe" Name="pgadmin3.exe" DiskId="1" src="../../src/Release/pgAdmin3.exe" />
+ <Shortcut Id="pgadmin_exes.pgadmin3.exe" Directory="SMDIR" Name="pgAdmin3" LongName="$(var.APPNAME)" Target="[#pgadmin_exes.pgadmin3.exe]" Description="pgAdmin III - PostgreSQL Tools" Show="normal" />
</Component>

<Directory Id="DOCSDIR" Name="Docs">
<Directory Id="EN_USDOCSDIR" Name="en_US">

<Component Id="pgadmin_docs" Guid="1F6CED52-1445-4524-83DC-77F7C34177A9">
- <File Id="bugreport.html.27EC6C64-27FA-4DFB-A2B4-319EED6AC426" Name="bugrep~1.htm" LongName="bugreport.html" DiskId="1" src="../../docs/en_US/bugreport.html" />
- <File Id="pgadmin3.chm.23042257-2AF2-4CB4-90A3-3C666954ED3D" Name="pgadmin3.chm" DiskId="1" src="../../docs/en_US/pgadmin3.chm" />
- <File Id="tips.txt.3ACBE917-C571-41CB-8AE0-E490A867A8C5" Name="tips.txt" DiskId="1" src="../../docs/en_US/tips.txt" />
- <Shortcut Id="pgadmin3.chm.EB2BB858-A743-4618-B1A4-A4470EFC6722" Directory="SMDIR" Name="pga3help" LongName="$(var.APPNAME) Help" Target="[#pgadmin3.chm.FD7C02B2-D4C6-498E-8F2B-01D1CADA1C56]" Description="pgAdmin and PostgreSQL documentation" Show="normal" />
+ <File Id="pgadmin_docs.bugreport.html" Name="bugrep~1.htm" LongName="bugreport.html" DiskId="1" src="../../docs/en_US/bugreport.html" />
+ <File Id="pgadmin_docs.pgadmin3.chm" Name="pgadmin3.chm" DiskId="1" src="../../docs/en_US/pgadmin3.chm" />
+ <File Id="pgadmin_docs.tips.txt" Name="tips.txt" DiskId="1" src="../../docs/en_US/tips.txt" />
+ <Shortcut Id="pgadmin_docs.pgadmin3.chm" Directory="SMDIR" Name="pga3help" LongName="$(var.APPNAME) Help" Target="[#pgadmin_docs.pgadmin3.chm]" Description="pgAdmin and PostgreSQL documentation" Show="normal" />
</Component>

<Directory Id="HINTSDIR" Name="Hints">

<Component Id="pgadmin_hints" Guid="72DD1747-4AF2-48F6-BF92-0A93A3D19593">
- <File Id="conn-hba.html.5AF46FC7-30FC-4784-B0C5-C9A0724FC8B4" Name="conn-h~1.htm" LongName="conn-hba.html" DiskId="1" src="../../docs/en_US/hints/conn-hba.html" />
- <File Id="conn-ident.html.65D01503-6F64-4F7B-A6B2-D1071370DA58" Name="conn-i~1.htm" LongName="conn-ident.html" DiskId="1" src="../../docs/en_US/hints/conn-ident.html" />
- <File Id="conn-listen.html.E3A10C15-0E96-421A-94CD-75A3A9319197" Name="conn-l~1.htm" LongName="conn-listen.html" DiskId="1" src="../../docs/en_US/hints/conn-listen.html" />
- <File Id="fki.html.C780A21A-D174-4E95-8162-0B33CDCDFC5D" Name="fki.htm" LongName="fki.html" DiskId="1" src="../../docs/en_US/hints/fki.html" />
- <File Id="multiple.html.9BEE8838-9AAA-4B32-A640-435EE175F9E8" Name="multiple.htm" LongName="multiple.html" DiskId="1" src="../../docs/en_US/hints/multiple.html" />
- <File Id="pk.html.23225A43-813C-4430-B5E9-019B7D2165B9" Name="pk.htm" LongName="conn-listen.html" DiskId="1" src="../../docs/en_US/hints/pk.html" />
- <File Id="vacuum.html.56364524-B864-4946-8743-5AA010854345" Name="vacuum.htm" LongName="vacuum.html" DiskId="1" src="../../docs/en_US/hints/vacuum.html" />
+ <File Id="pgadmin_hints.conn-hba.html" Name="conn-h~1.htm" LongName="conn-hba.html" DiskId="1" src="../../docs/en_US/hints/conn-hba.html" />
+ <File Id="pgadmin_hints.conn-ident.html" Name="conn-i~1.htm" LongName="conn-ident.html" DiskId="1" src="../../docs/en_US/hints/conn-ident.html" />
+ <File Id="pgadmin_hints.conn-listen.html" Name="conn-l~1.htm" LongName="conn-listen.html" DiskId="1" src="../../docs/en_US/hints/conn-listen.html" />
+ <File Id="pgadmin_hints.fki.html" Name="fki.htm" LongName="fki.html" DiskId="1" src="../../docs/en_US/hints/fki.html" />
+ <File Id="pgadmin_hints.multiple.html" Name="multiple.htm" LongName="multiple.html" DiskId="1" src="../../docs/en_US/hints/multiple.html" />
+ <File Id="pgadmin_hints.pk.html" Name="pk.htm" LongName="conn-listen.html" DiskId="1" src="../../docs/en_US/hints/pk.html" />
+ <File Id="pgadmin_hints.vacuum.html" Name="vacuum.htm" LongName="vacuum.html" DiskId="1" src="../../docs/en_US/hints/vacuum.html" />
</Component>

</Directory>
@@ -69,22 +69,22 @@
</Directory>

<Component Id="pgagent_exes" Guid="FD786FF5-F499-42B3-8070-248E987F7E91">
- <File Id="pgagent.exe.8E69310E-59ED-4CC8-BE51-20ABA932589F" Name="pgagent.exe" DiskId="1" src="../../xtra/pgagent/Release/pgAgent.exe" />
+ <File Id="pgagent_exes.pgagent.exe" Name="pgagent.exe" DiskId="1" src="../../xtra/pgagent/Release/pgAgent.exe" />
</Component>

<Component Id="postgresql_exes" Guid="43DFC362-A28E-4D52-A308-23AFD1347C58">
- <File Id="pg_dump.exe.D71BCE9A-29FC-4DF4-9F72-A284AD6DE450" Name="pg_dum~1.exe" LongName="pg_dump.exe" DiskId="1" src="$(var.PFILESDIR)/PostgreSQL/8.0/bin/pg_dump.exe" />
- <File Id="pg_restore.exe.798C3609-CCFC-460B-8F89-6405F2923107" Name="pg_res~1.exe" LongName="pg_restore.exe" DiskId="1" src="$(var.PFILESDIR)/PostgreSQL/8.0/bin/pg_restore.exe" />
+ <File Id="postgresql_exes.pg_dump.exe" Name="pg_dum~1.exe" LongName="pg_dump.exe" DiskId="1" src="$(var.PFILESDIR)/PostgreSQL/8.0/bin/pg_dump.exe" />
+ <File Id="postgresql_exes.pg_restore.exe" Name="pg_res~1.exe" LongName="pg_restore.exe" DiskId="1" src="$(var.PFILESDIR)/PostgreSQL/8.0/bin/pg_restore.exe" />
</Component>

<Component Id="pgagent_libs" Guid="97B9FF01-5EFC-4C4F-8989-0ECD3C0508D3">
- <File Id="pgaevent.dll.80F32304-643A-4A2A-ADDB-98EEA833A2C4" Name="pgaevent.dll" DiskId="1" src="../../xtra/pgagent/pgaevent/Release/pgaevent.dll" />
+ <File Id="pgagent_libs.pgaevent.dll" Name="pgaevent.dll" DiskId="1" src="../../xtra/pgagent/pgaevent/Release/pgaevent.dll" />
</Component>

<Directory Id="SCRIPTSDIR" Name="Scripts">

<Component Id="pgagent_scripts" Guid="073F4881-03BB-400F-8B3A-AAE055A7FCD8">
- <File Id="pgagent.sql.DAF759B9-EF63-473E-8AA7-392672C846B9" Name="pgagent.sql" DiskId="1" src="../../xtra/pgagent/pgagent.sql" />
+ <File Id="pgagent_scripts.pgagent.sql" Name="pgagent.sql" DiskId="1" src="../../xtra/pgagent/pgagent.sql" />
</Component>

</Directory>
@@ -92,8 +92,8 @@
<Directory Id="I18NDIR" Name="i18n">

<Component Id="pgadmin_il8n" Guid="7335FF66-AC77-433B-A6C5-E90178E02649">
- <File Id="pgadmin3.lng.33CD1653-DCA0-4E40-937F-235ACC6B5F9A" Name="pgadmin3.lng" DiskId="1" src="../../i18n/pgadmin3.lng" />
- <File Id="pg_settings.csv.556F6584-559F-400D-87B6-BCC90A75A816" Name="pg_set~1.csv" LongName="pg_settings.csv" DiskId="1" src="../../i18n/pg_settings.csv" />
+ <File Id="pgadmin_il8n.pgadmin3.lng" Name="pgadmin3.lng" DiskId="1" src="../../i18n/pgadmin3.lng" />
+ <File Id="pgadmin_il8n.pg_settings.csv" Name="pg_set~1.csv" LongName="pg_settings.csv" DiskId="1" src="../../i18n/pg_settings.csv" />
</Component>

<?include i18ndata.wxs ?>

Modified: trunk/pgadmin3/pkg/win32/src/ui.wxs
===================================================================
--- trunk/pgadmin3/pkg/win32/src/ui.wxs 2005-05-27 16:21:53 UTC (rev 4261)
+++ trunk/pgadmin3/pkg/win32/src/ui.wxs 2005-05-28 21:07:28 UTC (rev 4262)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Include>
<UI>

Modified: trunk/pgadmin3/pkg/win32/src/uidata.wxs
===================================================================
--- trunk/pgadmin3/pkg/win32/src/uidata.wxs 2005-05-27 16:21:53 UTC (rev 4261)
+++ trunk/pgadmin3/pkg/win32/src/uidata.wxs 2005-05-28 21:07:28 UTC (rev 4262)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
<Include>

<!-- Styles -->