diff --git a/include/winnls.h b/include/winnls.h
index d0d226ac731929cbb8a43e9db3f68089808cb931..c74a905a4d8268106f15f993cac94cbf419143e0 100644
--- a/include/winnls.h
+++ b/include/winnls.h
@@ -131,6 +131,13 @@
 #define LOCALE_SISO639LANGNAME      0x00000059
 #define LOCALE_SISO3166CTRYNAME     0x0000005A
 
+#define LOCALE_IDEFAULTEBCDICCODEPAGE 0x00001012
+#define LOCALE_IPAPERSIZE             0x0000100A
+#define LOCALE_SENGCURRNAME           0x00001007
+#define LOCALE_SNATIVECURRNAME        0x00001008
+#define LOCALE_SYEARMONTH             0x00001006
+#define LOCALE_SSORTNAME              0x00001013
+#define LOCALE_IDIGITSUBSTITUTION     0x00001014
 
 #define NORM_IGNORECASE				1
 #define NORM_IGNORENONSPACE			2
diff --git a/ole/nls/esa.nls b/ole/nls/esa.nls
index a6adf924ebe2c7377f496a6b3f88349e0166e71d..2d76b77c72cfc8d172da531cfa389e01e3835d78 100644
--- a/ole/nls/esa.nls
+++ b/ole/nls/esa.nls
@@ -8,7 +8,7 @@ LOCVAL(LOCALE_SLANGUAGE,"Espa
 LOCVAL(LOCALE_SENGLANGUAGE,"Spanish")
 LOCVAL(LOCALE_SABBREVLANGNAME,"esa")
 LOCVAL(LOCALE_SNATIVELANGNAME,"Español")
-/* LOCVAL(LOCALE_ICOUNTRY,"") */
+LOCVAL(LOCALE_ICOUNTRY, "507")
 LOCVAL(LOCALE_SCOUNTRY,"Panamá")
 LOCVAL(LOCALE_SENGCOUNTRY,"Panama")
 LOCVAL(LOCALE_SABBREVCTRYNAME,"PAN")
@@ -17,43 +17,43 @@ LOCVAL(LOCALE_IDEFAULTLANGUAGE,"040a")
 LOCVAL(LOCALE_IDEFAULTCOUNTRY,"34")
 LOCVAL(LOCALE_IDEFAULTCODEPAGE,"850")
 LOCVAL(LOCALE_IDEFAULTANSICODEPAGE,"1252")
-/* LOCVAL(LOCALE_SLIST,"") */
-/* LOCVAL(LOCALE_IMEASURE,"") */
-/* LOCVAL(LOCALE_SDECIMAL,"") */
-/* LOCVAL(LOCALE_STHOUSAND,"") */
-/* LOCVAL(LOCALE_SGROUPING) */
-/* LOCVAL(LOCALE_IDIGITS,"2") */
-/* LOCVAL(LOCALE_ILZERO,"1") */
-/* LOCVAL(LOCALE_INEGNUMBER) */
+LOCVAL(LOCALE_SLIST, ",")
+LOCVAL(LOCALE_IMEASURE, "0")
+LOCVAL(LOCALE_SDECIMAL, ".")
+LOCVAL(LOCALE_STHOUSAND, ",")
+LOCVAL(LOCALE_SGROUPING, "3;0")
+LOCVAL(LOCALE_IDIGITS, "2")
+LOCVAL(LOCALE_ILZERO, "1")
+LOCVAL(LOCALE_INEGNUMBER, "1")
 LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789")
 LOCVAL(LOCALE_SCURRENCY,"B")
 LOCVAL(LOCALE_SINTLSYMBOL, "PAB")
-/* LOCVAL(LOCALE_SMONDECIMALSEP,",") */
-/* LOCVAL(LOCALE_SMONTHOUSANDSEP,".") */
+LOCVAL(LOCALE_SMONDECIMALSEP, ".")
+LOCVAL(LOCALE_SMONTHOUSANDSEP, ",")
 LOCVAL(LOCALE_SMONGROUPING,"3;0")
-/* LOCVAL(LOCALE_ICURRDIGITS,"2") */
-/* LOCVAL(LOCALE_IINTLCURRDIGITS) */
-/* LOCVAL(LOCALE_ICURRENCY,"3") */
-/* LOCVAL(LOCALE_INEGCURR,"8") */
-/* LOCVAL(LOCALE_SDATE,".") */
-/* LOCVAL(LOCALE_STIME,":") */
-/* LOCVAL(LOCALE_SSHORTDATE,"dd/MM-yyyy") */
-/* LOCVAL(LOCALE_SLONGDATE,"ddd, d. MMMM yyyy") */
-/* LOCVAL(LOCALE_STIMEFORMAT) */
-/* LOCVAL(LOCALE_IDATE,"1") */
-/* LOCVAL(LOCALE_ILDATE) */
+LOCVAL(LOCALE_ICURRDIGITS, "2")
+LOCVAL(LOCALE_IINTLCURRDIGITS, "2")
+LOCVAL(LOCALE_ICURRENCY, "2")
+LOCVAL(LOCALE_INEGCURR, "14")
+LOCVAL(LOCALE_SDATE, "/")
+LOCVAL(LOCALE_STIME, ":")
+LOCVAL(LOCALE_SSHORTDATE, "MM/dd/yy")
+LOCVAL(LOCALE_SLONGDATE, "dddd, dd' de 'MMMM' de 'yyyy")
+LOCVAL(LOCALE_STIMEFORMAT, "hh:mm:ss tt")
+LOCVAL(LOCALE_IDATE, "0")
+LOCVAL(LOCALE_ILDATE, "1")
 LOCVAL(LOCALE_ITIME,"1")
-/* LOCVAL(LOCALE_ITIMEMARKPOSN) */
-/* LOCVAL(LOCALE_ICENTURY) */
+LOCVAL(LOCALE_ITIMEMARKPOSN, "0")
+LOCVAL(LOCALE_ICENTURY, "0")
 LOCVAL(LOCALE_ITLZERO,"1")
-/* LOCVAL(LOCALE_IDAYLZERO) */
-/* LOCVAL(LOCALE_IMONLZERO) */
-/* LOCVAL(LOCALE_S1159, "") */
-/* LOCVAL(LOCALE_S2359, "") */
+LOCVAL(LOCALE_IDAYLZERO, "1")
+LOCVAL(LOCALE_IMONLZERO, "1")
+LOCVAL(LOCALE_S1159, "a.m.")
+LOCVAL(LOCALE_S2359, "p.m.")
 LOCVAL(LOCALE_ICALENDARTYPE, "1")
-/* LOCVAL(LOCALE_IOPTIONALCALENDAR) */
-/* LOCVAL(LOCALE_IFIRSTDAYOFWEEK) */
-/* LOCVAL(LOCALE_IFIRSTWEEKOFYEAR) */
+LOCVAL(LOCALE_IOPTIONALCALENDAR, "0")
+LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "6")
+LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0")
 
 LOCVAL(LOCALE_SDAYNAME1,"lunes")
 LOCVAL(LOCALE_SDAYNAME2,"martes")
@@ -101,12 +101,19 @@ LOCVAL(LOCALE_SABBREVMONTHNAME13,"")
 
 LOCVAL(LOCALE_SPOSITIVESIGN, "")
 LOCVAL(LOCALE_SNEGATIVESIGN, "-")
-/* LOCVAL(LOCALE_IPOSSIGNPOSN, "") */
-/* LOCVAL(LOCALE_INEGSIGNPOSN, "") */
-/* LOCVAL(LOCALE_IPOSSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_IPOSSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_INEGSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_INEGSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_FONTSIGNATURE, "") */
+LOCVAL(LOCALE_IPOSSIGNPOSN, "3")
+LOCVAL(LOCALE_INEGSIGNPOSN, "0")
+LOCVAL(LOCALE_IPOSSYMPRECEDES, "1")
+LOCVAL(LOCALE_IPOSSEPBYSPACE, "1")
+LOCVAL(LOCALE_INEGSYMPRECEDES, "1")
+LOCVAL(LOCALE_INEGSEPBYSPACE, "1")
+LOCVAL(LOCALE_FONTSIGNATURE, "/")
 LOCVAL(LOCALE_SISO639LANGNAME,"es")
 LOCVAL(LOCALE_SISO3166CTRYNAME,"PA")
+LOCVAL(LOCALE_IDEFAULTEBCDICCODEPAGE, "20284")
+LOCVAL(LOCALE_IPAPERSIZE, "1")
+LOCVAL(LOCALE_SENGCURRNAME, "Panamanian Balboa")
+LOCVAL(LOCALE_SNATIVECURRNAME, "Balboa")
+LOCVAL(LOCALE_SYEARMONTH, "MMMM' de 'yyyy")
+LOCVAL(LOCALE_SSORTNAME, "Default")
+LOCVAL(LOCALE_IDIGITSUBSTITUTION, """")
diff --git a/ole/nls/esc.nls b/ole/nls/esc.nls
index 7906a4d7a8630156b278070114b7b73de2274e81..21a5cb41e7a6964442e61e1c1e34473cb8092fd6 100644
--- a/ole/nls/esc.nls
+++ b/ole/nls/esc.nls
@@ -8,7 +8,7 @@ LOCVAL(LOCALE_SLANGUAGE,"Espa
 LOCVAL(LOCALE_SENGLANGUAGE,"Spanish")
 LOCVAL(LOCALE_SABBREVLANGNAME,"esa")
 LOCVAL(LOCALE_SNATIVELANGNAME,"Español")
-/* LOCVAL(LOCALE_ICOUNTRY,"") */
+LOCVAL(LOCALE_ICOUNTRY, "506")
 LOCVAL(LOCALE_SCOUNTRY,"Costa Rica")
 LOCVAL(LOCALE_SENGCOUNTRY,"Costa Rica")
 LOCVAL(LOCALE_SABBREVCTRYNAME,"CRI")
@@ -17,43 +17,45 @@ LOCVAL(LOCALE_IDEFAULTLANGUAGE,"140a")
 LOCVAL(LOCALE_IDEFAULTCOUNTRY,"34")
 LOCVAL(LOCALE_IDEFAULTCODEPAGE,"850")
 LOCVAL(LOCALE_IDEFAULTANSICODEPAGE,"1252")
-/* LOCVAL(LOCALE_SLIST,"") */
-/* LOCVAL(LOCALE_IMEASURE,"") */
-/* LOCVAL(LOCALE_SDECIMAL,"") */
-/* LOCVAL(LOCALE_STHOUSAND,"") */
-/* LOCVAL(LOCALE_SGROUPING) */
-/* LOCVAL(LOCALE_IDIGITS,"2") */
-/* LOCVAL(LOCALE_ILZERO,"1") */
-/* LOCVAL(LOCALE_INEGNUMBER) */
+LOCVAL(LOCALE_SLIST, ",")
+LOCVAL(LOCALE_IMEASURE, "0")
+LOCVAL(LOCALE_SDECIMAL, ",")
+LOCVAL(LOCALE_STHOUSAND, ".")
+LOCVAL(LOCALE_SGROUPING, "3;0")
+LOCVAL(LOCALE_IDIGITS, "2")
+LOCVAL(LOCALE_ILZERO, "1")
+LOCVAL(LOCALE_INEGNUMBER, "1")
 LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789")
 LOCVAL(LOCALE_SCURRENCY,"C")
 LOCVAL(LOCALE_SINTLSYMBOL, "CRC")
-/* LOCVAL(LOCALE_SMONDECIMALSEP,",") */
-/* LOCVAL(LOCALE_SMONTHOUSANDSEP,".") */
+LOCVAL(LOCALE_SMONDECIMALSEP, ",")
+LOCVAL(LOCALE_SMONTHOUSANDSEP, ".")
 LOCVAL(LOCALE_SMONGROUPING,"3;0")
-/* LOCVAL(LOCALE_ICURRDIGITS,"2") */
-/* LOCVAL(LOCALE_IINTLCURRDIGITS) */
-/* LOCVAL(LOCALE_ICURRENCY,"3") */
-/* LOCVAL(LOCALE_INEGCURR,"8") */
-/* LOCVAL(LOCALE_SDATE,".") */
-/* LOCVAL(LOCALE_STIME,":") */
-/* LOCVAL(LOCALE_SSHORTDATE,"dd/MM-yyyy") */
-/* LOCVAL(LOCALE_SLONGDATE,"ddd, d. MMMM yyyy") */
-/* LOCVAL(LOCALE_STIMEFORMAT) */
-/* LOCVAL(LOCALE_IDATE,"1") */
-/* LOCVAL(LOCALE_ILDATE) */
+LOCVAL(LOCALE_ICURRDIGITS, "2")
+LOCVAL(LOCALE_IINTLCURRDIGITS, "2")
+LOCVAL(LOCALE_ICURRENCY, "0")
+LOCVAL(LOCALE_INEGCURR, "0")
+LOCVAL(LOCALE_SDATE, "/")
+LOCVAL(LOCALE_STIME, ":")
+LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy")
+LOCVAL(LOCALE_SLONGDATE, "dddd, dd' de 'MMMM' de 'yyyy")
+LOCVAL(LOCALE_STIMEFORMAT, "hh:mm:ss tt")
+LOCVAL(LOCALE_IDATE, "1")
+LOCVAL(LOCALE_ILDATE, "1")
 LOCVAL(LOCALE_ITIME,"1")
-/* LOCVAL(LOCALE_ITIMEMARKPOSN) */
-/* LOCVAL(LOCALE_ICENTURY) */
+LOCVAL(LOCALE_ITIMEMARKPOSN, "0")
+LOCVAL(LOCALE_ICENTURY, "0")
 LOCVAL(LOCALE_ITLZERO,"1")
-/* LOCVAL(LOCALE_IDAYLZERO) */
-/* LOCVAL(LOCALE_IMONLZERO) */
+LOCVAL(LOCALE_IDAYLZERO, "1")
+LOCVAL(LOCALE_IMONLZERO, "1")
+LOCVAL(LOCALE_S1159, "a.m.")
+LOCVAL(LOCALE_S2359, "p.m.")
 LOCVAL(LOCALE_S1159, "AM")
 LOCVAL(LOCALE_S2359, "PM")
 LOCVAL(LOCALE_ICALENDARTYPE, "1")
-/* LOCVAL(LOCALE_IOPTIONALCALENDAR) */
-/* LOCVAL(LOCALE_IFIRSTDAYOFWEEK) */
-/* LOCVAL(LOCALE_IFIRSTWEEKOFYEAR) */
+LOCVAL(LOCALE_IOPTIONALCALENDAR, "0")
+LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "6")
+LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0")
 
 LOCVAL(LOCALE_SDAYNAME1,"lunes")
 LOCVAL(LOCALE_SDAYNAME2,"martes")
@@ -101,12 +103,19 @@ LOCVAL(LOCALE_SABBREVMONTHNAME13,"")
 
 LOCVAL(LOCALE_SPOSITIVESIGN, "")
 LOCVAL(LOCALE_SNEGATIVESIGN, "-")
-/* LOCVAL(LOCALE_IPOSSIGNPOSN, "") */
-/* LOCVAL(LOCALE_INEGSIGNPOSN, "") */
-/* LOCVAL(LOCALE_IPOSSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_IPOSSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_INEGSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_INEGSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_FONTSIGNATURE, "") */
+LOCVAL(LOCALE_IPOSSIGNPOSN, "3")
+LOCVAL(LOCALE_INEGSIGNPOSN, "0")
+LOCVAL(LOCALE_IPOSSYMPRECEDES, "1")
+LOCVAL(LOCALE_IPOSSEPBYSPACE, "0")
+LOCVAL(LOCALE_INEGSYMPRECEDES, "1")
+LOCVAL(LOCALE_INEGSEPBYSPACE, "0")
+LOCVAL(LOCALE_FONTSIGNATURE, "/")
 LOCVAL(LOCALE_SISO639LANGNAME,"es")
 LOCVAL(LOCALE_SISO3166CTRYNAME,"CR")
+LOCVAL(LOCALE_IDEFAULTEBCDICCODEPAGE, "20284")
+LOCVAL(LOCALE_IPAPERSIZE, "1")
+LOCVAL(LOCALE_SENGCURRNAME, "Costa Rican Colon")
+LOCVAL(LOCALE_SNATIVECURRNAME, "Colón")
+LOCVAL(LOCALE_SYEARMONTH, "MMMM' de 'yyyy")
+LOCVAL(LOCALE_SSORTNAME, "Default")
+LOCVAL(LOCALE_IDIGITSUBSTITUTION, """")
diff --git a/ole/nls/esd.nls b/ole/nls/esd.nls
index 174b55011c6c0bfbbc338d2612805603980073f7..51c8d34b1b189e645d0a19bd754148b664ea8939 100644
--- a/ole/nls/esd.nls
+++ b/ole/nls/esd.nls
@@ -8,7 +8,7 @@ LOCVAL(LOCALE_SLANGUAGE,"Espa
 LOCVAL(LOCALE_SENGLANGUAGE,"Spanish")
 LOCVAL(LOCALE_SABBREVLANGNAME,"esd")
 LOCVAL(LOCALE_SNATIVELANGNAME,"Español")
-/* LOCVAL(LOCALE_ICOUNTRY,"") */
+LOCVAL(LOCALE_ICOUNTRY, "1")
 LOCVAL(LOCALE_SCOUNTRY,"República Dominicana")
 LOCVAL(LOCALE_SENGCOUNTRY,"Dominican Republic")
 LOCVAL(LOCALE_SABBREVCTRYNAME,"DOM")
@@ -17,43 +17,43 @@ LOCVAL(LOCALE_IDEFAULTLANGUAGE,"040a")
 LOCVAL(LOCALE_IDEFAULTCOUNTRY,"34")
 LOCVAL(LOCALE_IDEFAULTCODEPAGE,"850")
 LOCVAL(LOCALE_IDEFAULTANSICODEPAGE,"1252")
-/* LOCVAL(LOCALE_SLIST,"") */
-/* LOCVAL(LOCALE_IMEASURE,"") */
-/* LOCVAL(LOCALE_SDECIMAL,"") */
-/* LOCVAL(LOCALE_STHOUSAND,"") */
-/* LOCVAL(LOCALE_SGROUPING) */
-/* LOCVAL(LOCALE_IDIGITS,"2") */
-/* LOCVAL(LOCALE_ILZERO,"1") */
-/* LOCVAL(LOCALE_INEGNUMBER) */
+LOCVAL(LOCALE_SLIST, ",")
+LOCVAL(LOCALE_IMEASURE, "0")
+LOCVAL(LOCALE_SDECIMAL, ".")
+LOCVAL(LOCALE_STHOUSAND, ",")
+LOCVAL(LOCALE_SGROUPING, "3;0")
+LOCVAL(LOCALE_IDIGITS, "2")
+LOCVAL(LOCALE_ILZERO, "1")
+LOCVAL(LOCALE_INEGNUMBER, "1")
 LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789")
 LOCVAL(LOCALE_SCURRENCY,"RD$")
 LOCVAL(LOCALE_SINTLSYMBOL, "DOP")
-/* LOCVAL(LOCALE_SMONDECIMALSEP,",") */
-/* LOCVAL(LOCALE_SMONTHOUSANDSEP,".") */
+LOCVAL(LOCALE_SMONDECIMALSEP, ".")
+LOCVAL(LOCALE_SMONTHOUSANDSEP, ",")
 LOCVAL(LOCALE_SMONGROUPING,"3;0")
-/* LOCVAL(LOCALE_ICURRDIGITS,"2") */
-/* LOCVAL(LOCALE_IINTLCURRDIGITS) */
-/* LOCVAL(LOCALE_ICURRENCY,"3") */
-/* LOCVAL(LOCALE_INEGCURR,"8") */
-/* LOCVAL(LOCALE_SDATE,".") */
-/* LOCVAL(LOCALE_STIME,":") */
-/* LOCVAL(LOCALE_SSHORTDATE,"dd/MM-yyyy") */
-/* LOCVAL(LOCALE_SLONGDATE,"ddd, d. MMMM yyyy") */
-/* LOCVAL(LOCALE_STIMEFORMAT) */
-/* LOCVAL(LOCALE_IDATE,"1") */
-/* LOCVAL(LOCALE_ILDATE) */
+LOCVAL(LOCALE_ICURRDIGITS, "2")
+LOCVAL(LOCALE_IINTLCURRDIGITS, "2")
+LOCVAL(LOCALE_ICURRENCY, "0")
+LOCVAL(LOCALE_INEGCURR, "0")
+LOCVAL(LOCALE_SDATE, "/")
+LOCVAL(LOCALE_STIME, ":")
+LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy")
+LOCVAL(LOCALE_SLONGDATE, "dddd, dd' de 'MMMM' de 'yyyy")
+LOCVAL(LOCALE_STIMEFORMAT, "hh:mm:ss tt")
+LOCVAL(LOCALE_IDATE, "1")
+LOCVAL(LOCALE_ILDATE, "1")
 LOCVAL(LOCALE_ITIME,"1")
-/* LOCVAL(LOCALE_ITIMEMARKPOSN) */
-/* LOCVAL(LOCALE_ICENTURY) */
+LOCVAL(LOCALE_ITIMEMARKPOSN, "0")
+LOCVAL(LOCALE_ICENTURY, "0")
 LOCVAL(LOCALE_ITLZERO,"1")
-/* LOCVAL(LOCALE_IDAYLZERO) */
-/* LOCVAL(LOCALE_IMONLZERO) */
-/* LOCVAL(LOCALE_S1159, "") */
-/* LOCVAL(LOCALE_S2359, "") */
+LOCVAL(LOCALE_IDAYLZERO, "1")
+LOCVAL(LOCALE_IMONLZERO, "1")
+LOCVAL(LOCALE_S1159, "a.m.")
+LOCVAL(LOCALE_S2359, "p.m.")
 LOCVAL(LOCALE_ICALENDARTYPE, "1")
-/* LOCVAL(LOCALE_IOPTIONALCALENDAR) */
-/* LOCVAL(LOCALE_IFIRSTDAYOFWEEK) */
-/* LOCVAL(LOCALE_IFIRSTWEEKOFYEAR) */
+LOCVAL(LOCALE_IOPTIONALCALENDAR, "0")
+LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "6")
+LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0")
 
 LOCVAL(LOCALE_SDAYNAME1,"lunes")
 LOCVAL(LOCALE_SDAYNAME2,"martes")
@@ -101,12 +101,19 @@ LOCVAL(LOCALE_SABBREVMONTHNAME13,"")
 
 LOCVAL(LOCALE_SPOSITIVESIGN, "")
 LOCVAL(LOCALE_SNEGATIVESIGN, "-")
-/* LOCVAL(LOCALE_IPOSSIGNPOSN, "") */
-/* LOCVAL(LOCALE_INEGSIGNPOSN, "") */
-/* LOCVAL(LOCALE_IPOSSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_IPOSSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_INEGSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_INEGSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_FONTSIGNATURE, "") */
+LOCVAL(LOCALE_IPOSSIGNPOSN, "3")
+LOCVAL(LOCALE_INEGSIGNPOSN, "0")
+LOCVAL(LOCALE_IPOSSYMPRECEDES, "1")
+LOCVAL(LOCALE_IPOSSEPBYSPACE, "0")
+LOCVAL(LOCALE_INEGSYMPRECEDES, "1")
+LOCVAL(LOCALE_INEGSEPBYSPACE, "0")
+LOCVAL(LOCALE_FONTSIGNATURE, "/")
 LOCVAL(LOCALE_SISO639LANGNAME,"es")
 LOCVAL(LOCALE_SISO3166CTRYNAME,"DO")
+LOCVAL(LOCALE_IDEFAULTEBCDICCODEPAGE, "20284")
+LOCVAL(LOCALE_IPAPERSIZE, "1")
+LOCVAL(LOCALE_SENGCURRNAME, "Dominican Peso")
+LOCVAL(LOCALE_SNATIVECURRNAME, "Peso")
+LOCVAL(LOCALE_SYEARMONTH, "MMMM' de 'yyyy")
+LOCVAL(LOCALE_SSORTNAME, "Default")
+LOCVAL(LOCALE_IDIGITSUBSTITUTION, """")
diff --git a/ole/nls/esg.nls b/ole/nls/esg.nls
index e9ac7c2a19c539699f7c572a7a0f616dd6450637..fec2a69d95ef3a8c581a5be1761e8d32e2575536 100644
--- a/ole/nls/esg.nls
+++ b/ole/nls/esg.nls
@@ -9,7 +9,7 @@ LOCVAL(LOCALE_SLANGUAGE,"Espa
 LOCVAL(LOCALE_SENGLANGUAGE,"Spanish")
 LOCVAL(LOCALE_SABBREVLANGNAME,"esg")
 LOCVAL(LOCALE_SNATIVELANGNAME,"Español")
-/* LOCVAL(LOCALE_ICOUNTRY,"") */
+LOCVAL(LOCALE_ICOUNTRY, "502")
 LOCVAL(LOCALE_SCOUNTRY,"Guatemala")
 LOCVAL(LOCALE_SENGCOUNTRY,"Guatemala")
 LOCVAL(LOCALE_SABBREVCTRYNAME,"GTM")
@@ -18,43 +18,43 @@ LOCVAL(LOCALE_IDEFAULTLANGUAGE,"040a")
 LOCVAL(LOCALE_IDEFAULTCOUNTRY,"34")
 LOCVAL(LOCALE_IDEFAULTCODEPAGE,"850")
 LOCVAL(LOCALE_IDEFAULTANSICODEPAGE,"1252")
-/* LOCVAL(LOCALE_SLIST,"") */
-/* LOCVAL(LOCALE_IMEASURE,"") */
-/* LOCVAL(LOCALE_SDECIMAL,"") */
-/* LOCVAL(LOCALE_STHOUSAND,"") */
-/* LOCVAL(LOCALE_SGROUPING) */
-/* LOCVAL(LOCALE_IDIGITS,"2") */
-/* LOCVAL(LOCALE_ILZERO,"1") */
-/* LOCVAL(LOCALE_INEGNUMBER) */
+LOCVAL(LOCALE_SLIST, ",")
+LOCVAL(LOCALE_IMEASURE, "0")
+LOCVAL(LOCALE_SDECIMAL, ".")
+LOCVAL(LOCALE_STHOUSAND, ",")
+LOCVAL(LOCALE_SGROUPING, "3;0")
+LOCVAL(LOCALE_IDIGITS, "2")
+LOCVAL(LOCALE_ILZERO, "1")
+LOCVAL(LOCALE_INEGNUMBER, "1")
 LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789")
 LOCVAL(LOCALE_SCURRENCY,"Q")
 LOCVAL(LOCALE_SINTLSYMBOL, "GTQ")
-/* LOCVAL(LOCALE_SMONDECIMALSEP,",") */
-/* LOCVAL(LOCALE_SMONTHOUSANDSEP,".") */
+LOCVAL(LOCALE_SMONDECIMALSEP, ".")
+LOCVAL(LOCALE_SMONTHOUSANDSEP, ",")
 LOCVAL(LOCALE_SMONGROUPING, "3;0")
-/* LOCVAL(LOCALE_ICURRDIGITS,"2") */
-/* LOCVAL(LOCALE_IINTLCURRDIGITS) */
-/* LOCVAL(LOCALE_ICURRENCY,"3") */
-/* LOCVAL(LOCALE_INEGCURR,"8") */
-/* LOCVAL(LOCALE_SDATE,".") */
-/* LOCVAL(LOCALE_STIME,":") */
-/* LOCVAL(LOCALE_SSHORTDATE,"dd/MM-yyyy") */
-/* LOCVAL(LOCALE_SLONGDATE,"ddd, d. MMMM yyyy") */
-/* LOCVAL(LOCALE_STIMEFORMAT) */
-/* LOCVAL(LOCALE_IDATE,"1") */
-/* LOCVAL(LOCALE_ILDATE) */
+LOCVAL(LOCALE_ICURRDIGITS, "2")
+LOCVAL(LOCALE_IINTLCURRDIGITS, "2")
+LOCVAL(LOCALE_ICURRENCY, "0")
+LOCVAL(LOCALE_INEGCURR, "0")
+LOCVAL(LOCALE_SDATE, "/")
+LOCVAL(LOCALE_STIME, ":")
+LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy")
+LOCVAL(LOCALE_SLONGDATE, "dddd, dd' de 'MMMM' de 'yyyy")
+LOCVAL(LOCALE_STIMEFORMAT, "hh:mm:ss tt")
+LOCVAL(LOCALE_IDATE, "1")
+LOCVAL(LOCALE_ILDATE, "1")
 LOCVAL(LOCALE_ITIME,"1")
-/* LOCVAL(LOCALE_ITIMEMARKPOSN) */
-/* LOCVAL(LOCALE_ICENTURY) */
+LOCVAL(LOCALE_ITIMEMARKPOSN, "0")
+LOCVAL(LOCALE_ICENTURY, "0")
 LOCVAL(LOCALE_ITLZERO,"1")
-/* LOCVAL(LOCALE_IDAYLZERO) */
-/* LOCVAL(LOCALE_IMONLZERO) */
-/* LOCVAL(LOCALE_S1159, "") */
-/* LOCVAL(LOCALE_S2359, "") */
+LOCVAL(LOCALE_IDAYLZERO, "1")
+LOCVAL(LOCALE_IMONLZERO, "1")
+LOCVAL(LOCALE_S1159, "a.m.")
+LOCVAL(LOCALE_S2359, "p.m.")
 LOCVAL(LOCALE_ICALENDARTYPE, "1")
-/* LOCVAL(LOCALE_IOPTIONALCALENDAR) */
-/* LOCVAL(LOCALE_IFIRSTDAYOFWEEK) */
-/* LOCVAL(LOCALE_IFIRSTWEEKOFYEAR) */
+LOCVAL(LOCALE_IOPTIONALCALENDAR, "0")
+LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "6")
+LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0")
 
 LOCVAL(LOCALE_SDAYNAME1,"lunes")
 LOCVAL(LOCALE_SDAYNAME2,"martes")
@@ -102,12 +102,19 @@ LOCVAL(LOCALE_SABBREVMONTHNAME13,"")
 
 LOCVAL(LOCALE_SPOSITIVESIGN, "")
 LOCVAL(LOCALE_SNEGATIVESIGN, "-")
-/* LOCVAL(LOCALE_IPOSSIGNPOSN, "") */
-/* LOCVAL(LOCALE_INEGSIGNPOSN, "") */
-/* LOCVAL(LOCALE_IPOSSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_IPOSSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_INEGSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_INEGSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_FONTSIGNATURE, "") */
+LOCVAL(LOCALE_IPOSSIGNPOSN, "3")
+LOCVAL(LOCALE_INEGSIGNPOSN, "0")
+LOCVAL(LOCALE_IPOSSYMPRECEDES, "1")
+LOCVAL(LOCALE_IPOSSEPBYSPACE, "0")
+LOCVAL(LOCALE_INEGSYMPRECEDES, "1")
+LOCVAL(LOCALE_INEGSEPBYSPACE, "0")
+LOCVAL(LOCALE_FONTSIGNATURE, "/")
 LOCVAL(LOCALE_SISO639LANGNAME,"es")
 LOCVAL(LOCALE_SISO3166CTRYNAME,"GT")
+LOCVAL(LOCALE_IDEFAULTEBCDICCODEPAGE, "20284")
+LOCVAL(LOCALE_IPAPERSIZE, "1")
+LOCVAL(LOCALE_SENGCURRNAME, "Guatemalan Quetzal")
+LOCVAL(LOCALE_SNATIVECURRNAME, "Quetzal")
+LOCVAL(LOCALE_SYEARMONTH, "MMMM' de 'yyyy")
+LOCVAL(LOCALE_SSORTNAME, "Default")
+LOCVAL(LOCALE_IDIGITSUBSTITUTION, """")
diff --git a/ole/nls/esm.nls b/ole/nls/esm.nls
index 5c00e470532428567fc63e07c8fb04da0512f266..fae6adc4d2d1519a1e162c29976cd91e9076872d 100644
--- a/ole/nls/esm.nls
+++ b/ole/nls/esm.nls
@@ -8,7 +8,7 @@ LOCVAL(LOCALE_SLANGUAGE,"Espa
 LOCVAL(LOCALE_SENGLANGUAGE,"Spanish (Mexico)")
 LOCVAL(LOCALE_SABBREVLANGNAME,"esm")
 LOCVAL(LOCALE_SNATIVELANGNAME,"Español (Mexico)")
-/* LOCVAL(LOCALE_ICOUNTRY,"") */
+LOCVAL(LOCALE_ICOUNTRY, "52")
 LOCVAL(LOCALE_SCOUNTRY,"Mexico")
 LOCVAL(LOCALE_SENGCOUNTRY,"Mexico")
 LOCVAL(LOCALE_SABBREVCTRYNAME,"MEX")
@@ -17,43 +17,43 @@ LOCVAL(LOCALE_IDEFAULTLANGUAGE,"040a")
 LOCVAL(LOCALE_IDEFAULTCOUNTRY,"34")
 LOCVAL(LOCALE_IDEFAULTCODEPAGE,"850")
 LOCVAL(LOCALE_IDEFAULTANSICODEPAGE,"1252")
-/* LOCVAL(LOCALE_SLIST,"") */
-/* LOCVAL(LOCALE_IMEASURE,"") */
-/* LOCVAL(LOCALE_SDECIMAL,"") */
-/* LOCVAL(LOCALE_STHOUSAND,"") */
-/* LOCVAL(LOCALE_SGROUPING) */
-/* LOCVAL(LOCALE_IDIGITS,"2") */
-/* LOCVAL(LOCALE_ILZERO,"1") */
-/* LOCVAL(LOCALE_INEGNUMBER) */
+LOCVAL(LOCALE_SLIST, ",")
+LOCVAL(LOCALE_IMEASURE, "0")
+LOCVAL(LOCALE_SDECIMAL, ".")
+LOCVAL(LOCALE_STHOUSAND, ",")
+LOCVAL(LOCALE_SGROUPING, "3;0")
+LOCVAL(LOCALE_IDIGITS, "2")
+LOCVAL(LOCALE_ILZERO, "1")
+LOCVAL(LOCALE_INEGNUMBER, "1")
 LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789")
 LOCVAL(LOCALE_SCURRENCY,"$")
 LOCVAL(LOCALE_SINTLSYMBOL, "MXN")
-/* LOCVAL(LOCALE_SMONDECIMALSEP,",") */
-/* LOCVAL(LOCALE_SMONTHOUSANDSEP,".") */
+LOCVAL(LOCALE_SMONDECIMALSEP, ".")
+LOCVAL(LOCALE_SMONTHOUSANDSEP, ",")
 LOCVAL(LOCALE_SMONGROUPING, "3;0")
-/* LOCVAL(LOCALE_ICURRDIGITS,"2") */
-/* LOCVAL(LOCALE_IINTLCURRDIGITS) */
-/* LOCVAL(LOCALE_ICURRENCY,"3") */
-/* LOCVAL(LOCALE_INEGCURR,"8") */
-/* LOCVAL(LOCALE_SDATE,".") */
-/* LOCVAL(LOCALE_STIME,":") */
-/* LOCVAL(LOCALE_SSHORTDATE,"dd/MM-yyyy") */
-/* LOCVAL(LOCALE_SLONGDATE,"ddd, d. MMMM yyyy") */
-/* LOCVAL(LOCALE_STIMEFORMAT) */
-/* LOCVAL(LOCALE_IDATE,"1") */
-/* LOCVAL(LOCALE_ILDATE) */
+LOCVAL(LOCALE_ICURRDIGITS, "2")
+LOCVAL(LOCALE_IINTLCURRDIGITS, "2")
+LOCVAL(LOCALE_ICURRENCY, "0")
+LOCVAL(LOCALE_INEGCURR, "1")
+LOCVAL(LOCALE_SDATE, "/")
+LOCVAL(LOCALE_STIME, ":")
+LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy")
+LOCVAL(LOCALE_SLONGDATE, "dddd, dd' de 'MMMM' de 'yyyy")
+LOCVAL(LOCALE_STIMEFORMAT, "hh:mm:ss tt")
+LOCVAL(LOCALE_IDATE, "1")
+LOCVAL(LOCALE_ILDATE, "1")
 LOCVAL(LOCALE_ITIME,"1")
-/* LOCVAL(LOCALE_ITIMEMARKPOSN) */
-/* LOCVAL(LOCALE_ICENTURY) */
+LOCVAL(LOCALE_ITIMEMARKPOSN, "0")
+LOCVAL(LOCALE_ICENTURY, "0")
 LOCVAL(LOCALE_ITLZERO,"1")
-/* LOCVAL(LOCALE_IDAYLZERO) */
-/* LOCVAL(LOCALE_IMONLZERO) */
-/* LOCVAL(LOCALE_S1159, "") */
-/* LOCVAL(LOCALE_S2359, "") */
+LOCVAL(LOCALE_IDAYLZERO, "1")
+LOCVAL(LOCALE_IMONLZERO, "1")
+LOCVAL(LOCALE_S1159, "a.m.")
+LOCVAL(LOCALE_S2359, "p.m.")
 LOCVAL(LOCALE_ICALENDARTYPE, "1")
-/* LOCVAL(LOCALE_IOPTIONALCALENDAR) */
-/* LOCVAL(LOCALE_IFIRSTDAYOFWEEK) */
-/* LOCVAL(LOCALE_IFIRSTWEEKOFYEAR) */
+LOCVAL(LOCALE_IOPTIONALCALENDAR, "0")
+LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "6")
+LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0")
 
 LOCVAL(LOCALE_SDAYNAME1,"lunes")
 LOCVAL(LOCALE_SDAYNAME2,"martes")
@@ -101,12 +101,20 @@ LOCVAL(LOCALE_SABBREVMONTHNAME13,"")
 
 LOCVAL(LOCALE_SPOSITIVESIGN, "")
 LOCVAL(LOCALE_SNEGATIVESIGN, "-")
-/* LOCVAL(LOCALE_IPOSSIGNPOSN, "") */
-/* LOCVAL(LOCALE_INEGSIGNPOSN, "") */
-/* LOCVAL(LOCALE_IPOSSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_IPOSSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_INEGSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_INEGSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_FONTSIGNATURE, "") */
+LOCVAL(LOCALE_IPOSSIGNPOSN, "3")
+LOCVAL(LOCALE_INEGSIGNPOSN, "3")
+LOCVAL(LOCALE_IPOSSYMPRECEDES, "1")
+LOCVAL(LOCALE_IPOSSEPBYSPACE, "0")
+LOCVAL(LOCALE_INEGSYMPRECEDES, "1")
+LOCVAL(LOCALE_INEGSEPBYSPACE, "0")
+LOCVAL(LOCALE_FONTSIGNATURE, "/")
 LOCVAL(LOCALE_SISO639LANGNAME,"es")
 LOCVAL(LOCALE_SISO3166CTRYNAME,"MX")
+
+LOCVAL(LOCALE_IDEFAULTEBCDICCODEPAGE, "20284")
+LOCVAL(LOCALE_IPAPERSIZE, "1")
+LOCVAL(LOCALE_SENGCURRNAME, "Mexican Nuevo Peso")
+LOCVAL(LOCALE_SNATIVECURRNAME, "Peso")
+LOCVAL(LOCALE_SYEARMONTH, "MMMM' de 'yyyy")
+LOCVAL(LOCALE_SSORTNAME, "Default")
+LOCVAL(LOCALE_IDIGITSUBSTITUTION, """")
diff --git a/ole/nls/esn.nls b/ole/nls/esn.nls
index f62cd59372b5048532a50f9ea49e3a6fda96a4f0..8f5ecb0a5eaf9f7f0c75c842e818d050c270a74d 100644
--- a/ole/nls/esn.nls
+++ b/ole/nls/esn.nls
@@ -17,43 +17,44 @@ LOCVAL(LOCALE_IDEFAULTLANGUAGE,"040a")
 LOCVAL(LOCALE_IDEFAULTCOUNTRY,"34")
 LOCVAL(LOCALE_IDEFAULTCODEPAGE,"850")
 LOCVAL(LOCALE_IDEFAULTANSICODEPAGE,"1252")
-/* LOCVAL(LOCALE_SLIST,"") */
-/* LOCVAL(LOCALE_IMEASURE,"") */
-/* LOCVAL(LOCALE_SDECIMAL,"") */
-/* LOCVAL(LOCALE_STHOUSAND,"") */
-/* LOCVAL(LOCALE_SGROUPING) */
-/* LOCVAL(LOCALE_IDIGITS,"2") */
-/* LOCVAL(LOCALE_ILZERO,"1") */
-/* LOCVAL(LOCALE_INEGNUMBER) */
+LOCVAL(LOCALE_SLIST, ";")
+LOCVAL(LOCALE_IMEASURE, "0")
+LOCVAL(LOCALE_SDECIMAL, ",")
+LOCVAL(LOCALE_STHOUSAND, ".")
+LOCVAL(LOCALE_SGROUPING, "3;0")
+LOCVAL(LOCALE_IDIGITS, "2")
+LOCVAL(LOCALE_ILZERO, "1")
+LOCVAL(LOCALE_INEGNUMBER, "1")
 LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789")
 LOCVAL(LOCALE_SCURRENCY,"Pts")
 LOCVAL(LOCALE_SINTLSYMBOL, "ESP")
-/* LOCVAL(LOCALE_SMONDECIMALSEP,",") */
-/* LOCVAL(LOCALE_SMONTHOUSANDSEP,".") */
+LOCVAL(LOCALE_SMONDECIMALSEP, ",")
+LOCVAL(LOCALE_SMONTHOUSANDSEP, ".")
 LOCVAL(LOCALE_SMONGROUPING, "3;0")
-/* LOCVAL(LOCALE_ICURRDIGITS,"2") */
-/* LOCVAL(LOCALE_IINTLCURRDIGITS) */
-/* LOCVAL(LOCALE_ICURRENCY,"3") */
-/* LOCVAL(LOCALE_INEGCURR,"8") */
-/* LOCVAL(LOCALE_SDATE,".") */
-/* LOCVAL(LOCALE_STIME,":") */
-/* LOCVAL(LOCALE_SSHORTDATE,"dd/MM-yyyy") */
-/* LOCVAL(LOCALE_SLONGDATE,"ddd, d. MMMM yyyy") */
-/* LOCVAL(LOCALE_STIMEFORMAT) */
-/* LOCVAL(LOCALE_IDATE,"1") */
-/* LOCVAL(LOCALE_ILDATE) */
+LOCVAL(LOCALE_IINTLCURRDIGITS, "0")
+LOCVAL(LOCALE_ICURRDIGITS, "0")
+LOCVAL(LOCALE_IINTLCURRDIGITS, "0")
+LOCVAL(LOCALE_ICURRENCY, "3")
+LOCVAL(LOCALE_INEGCURR, "8")
+LOCVAL(LOCALE_SDATE, "/")
+LOCVAL(LOCALE_STIME, ":")
+LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy")
+LOCVAL(LOCALE_SLONGDATE, "dddd, dd' de 'MMMM' de 'yyyy")
+LOCVAL(LOCALE_STIMEFORMAT, "H:mm:ss")
+LOCVAL(LOCALE_IDATE, "1")
+LOCVAL(LOCALE_ILDATE, "1")
 LOCVAL(LOCALE_ITIME,"1")
-/* LOCVAL(LOCALE_ITIMEMARKPOSN) */
-/* LOCVAL(LOCALE_ICENTURY) */
+LOCVAL(LOCALE_ITIMEMARKPOSN, "0")
+LOCVAL(LOCALE_ICENTURY, "0")
 LOCVAL(LOCALE_ITLZERO,"1")
-/* LOCVAL(LOCALE_IDAYLZERO) */
-/* LOCVAL(LOCALE_IMONLZERO) */
-/* LOCVAL(LOCALE_S1159, "") */
-/* LOCVAL(LOCALE_S2359, "") */
+LOCVAL(LOCALE_IDAYLZERO, "1")
+LOCVAL(LOCALE_IMONLZERO, "1")
+LOCVAL(LOCALE_S1159, "a.m.")
+LOCVAL(LOCALE_S2359, "p.m.")
 LOCVAL(LOCALE_ICALENDARTYPE, "1")
-/* LOCVAL(LOCALE_IOPTIONALCALENDAR) */
-/* LOCVAL(LOCALE_IFIRSTDAYOFWEEK) */
-/* LOCVAL(LOCALE_IFIRSTWEEKOFYEAR) */
+LOCVAL(LOCALE_IOPTIONALCALENDAR, "0")
+LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "0")
+LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0")
 
 LOCVAL(LOCALE_SDAYNAME1,"lunes")
 LOCVAL(LOCALE_SDAYNAME2,"martes")
@@ -101,12 +102,19 @@ LOCVAL(LOCALE_SABBREVMONTHNAME13,"")
 
 LOCVAL(LOCALE_SPOSITIVESIGN, "")
 LOCVAL(LOCALE_SNEGATIVESIGN, "-")
-/* LOCVAL(LOCALE_IPOSSIGNPOSN, "") */
-/* LOCVAL(LOCALE_INEGSIGNPOSN, "") */
-/* LOCVAL(LOCALE_IPOSSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_IPOSSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_INEGSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_INEGSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_FONTSIGNATURE, "") */
+LOCVAL(LOCALE_IPOSSIGNPOSN, "1")
+LOCVAL(LOCALE_INEGSIGNPOSN, "1")
+LOCVAL(LOCALE_IPOSSYMPRECEDES, "0")
+LOCVAL(LOCALE_IPOSSEPBYSPACE, "1")
+LOCVAL(LOCALE_INEGSYMPRECEDES, "0")
+LOCVAL(LOCALE_INEGSEPBYSPACE, "1")
+LOCVAL(LOCALE_FONTSIGNATURE, "/")
 LOCVAL(LOCALE_SISO639LANGNAME,"es")
 LOCVAL(LOCALE_SISO3166CTRYNAME,"ES")
+LOCVAL(LOCALE_IDEFAULTEBCDICCODEPAGE, "20284")
+LOCVAL(LOCALE_IPAPERSIZE, "9")
+LOCVAL(LOCALE_SENGCURRNAME, "Spanish Peseta")
+LOCVAL(LOCALE_SNATIVECURRNAME, "Peseta")
+LOCVAL(LOCALE_SYEARMONTH, "MMMM' de 'yyyy")
+LOCVAL(LOCALE_SSORTNAME, "Default")
+LOCVAL(LOCALE_IDIGITSUBSTITUTION, """")
diff --git a/ole/nls/esp.nls b/ole/nls/esp.nls
index df238c72936c13ff7a2f3c11f4b245ce36f0e2da..9599c42a3483e6878a8d6a8fd68c6a7d6b8b308d 100644
--- a/ole/nls/esp.nls
+++ b/ole/nls/esp.nls
@@ -17,43 +17,43 @@ LOCVAL(LOCALE_IDEFAULTLANGUAGE,"040a")
 LOCVAL(LOCALE_IDEFAULTCOUNTRY,"34")
 LOCVAL(LOCALE_IDEFAULTCODEPAGE,"850")
 LOCVAL(LOCALE_IDEFAULTANSICODEPAGE,"1252")
-/* LOCVAL(LOCALE_SLIST,"") */
-/* LOCVAL(LOCALE_IMEASURE,"") */
-/* LOCVAL(LOCALE_SDECIMAL,"") */
-/* LOCVAL(LOCALE_STHOUSAND,"") */
-/* LOCVAL(LOCALE_SGROUPING) */
-/* LOCVAL(LOCALE_IDIGITS,"2") */
-/* LOCVAL(LOCALE_ILZERO,"1") */
-/* LOCVAL(LOCALE_INEGNUMBER) */
+LOCVAL(LOCALE_SLIST, ";")
+LOCVAL(LOCALE_IMEASURE, "0")
+LOCVAL(LOCALE_SDECIMAL, ",")
+LOCVAL(LOCALE_STHOUSAND, ".")
+LOCVAL(LOCALE_SGROUPING, "3;0")
+LOCVAL(LOCALE_IDIGITS, "2")
+LOCVAL(LOCALE_ILZERO, "1")
+LOCVAL(LOCALE_INEGNUMBER, "1")
 LOCVAL(LOCALE_SNATIVEDIGITS, "0123456789")
 LOCVAL(LOCALE_SCURRENCY,"Pts")
 LOCVAL(LOCALE_SINTLSYMBOL, "ESP")
-/* LOCVAL(LOCALE_SMONDECIMALSEP,",") */
-/* LOCVAL(LOCALE_SMONTHOUSANDSEP,".") */
+LOCVAL(LOCALE_SMONDECIMALSEP, ",")
+LOCVAL(LOCALE_SMONTHOUSANDSEP, ".")
 LOCVAL(LOCALE_SMONGROUPING, "3;0")
-/* LOCVAL(LOCALE_ICURRDIGITS,"2") */
-/* LOCVAL(LOCALE_IINTLCURRDIGITS) */
-/* LOCVAL(LOCALE_ICURRENCY,"3") */
-/* LOCVAL(LOCALE_INEGCURR,"8") */
-/* LOCVAL(LOCALE_SDATE,".") */
-/* LOCVAL(LOCALE_STIME,":") */
-/* LOCVAL(LOCALE_SSHORTDATE,"dd/MM-yyyy") */
-/* LOCVAL(LOCALE_SLONGDATE,"ddd, d. MMMM yyyy") */
-/* LOCVAL(LOCALE_STIMEFORMAT) */
-/* LOCVAL(LOCALE_IDATE,"1") */
-/* LOCVAL(LOCALE_ILDATE) */
+LOCVAL(LOCALE_ICURRDIGITS, "0")
+LOCVAL(LOCALE_IINTLCURRDIGITS, "0")
+LOCVAL(LOCALE_ICURRENCY, "3")
+LOCVAL(LOCALE_INEGCURR, "8")
+LOCVAL(LOCALE_SDATE, "/")
+LOCVAL(LOCALE_STIME, ":")
+LOCVAL(LOCALE_SSHORTDATE, "dd/MM/yy")
+LOCVAL(LOCALE_SLONGDATE, "dddd, dd' de 'MMMM' de 'yyyy")
+LOCVAL(LOCALE_STIMEFORMAT, "H:mm:ss")
+LOCVAL(LOCALE_IDATE, "1")
+LOCVAL(LOCALE_ILDATE, "1")
 LOCVAL(LOCALE_ITIME,"1")
-/* LOCVAL(LOCALE_ITIMEMARKPOSN) */
-/* LOCVAL(LOCALE_ICENTURY) */
+LOCVAL(LOCALE_ITIMEMARKPOSN, "0")
+LOCVAL(LOCALE_ICENTURY, "0")
 LOCVAL(LOCALE_ITLZERO,"1")
-/* LOCVAL(LOCALE_IDAYLZERO) */
-/* LOCVAL(LOCALE_IMONLZERO) */
-/* LOCVAL(LOCALE_S1159, "") */
-/* LOCVAL(LOCALE_S2359, "") */
+LOCVAL(LOCALE_IDAYLZERO, "1")
+LOCVAL(LOCALE_IMONLZERO, "1")
+LOCVAL(LOCALE_S1159, "a.m.")
+LOCVAL(LOCALE_S2359, "p.m.")
 LOCVAL(LOCALE_ICALENDARTYPE, "1")
-/* LOCVAL(LOCALE_IOPTIONALCALENDAR) */
-/* LOCVAL(LOCALE_IFIRSTDAYOFWEEK) */
-/* LOCVAL(LOCALE_IFIRSTWEEKOFYEAR) */
+LOCVAL(LOCALE_IOPTIONALCALENDAR, "0")
+LOCVAL(LOCALE_IFIRSTDAYOFWEEK, "0")
+LOCVAL(LOCALE_IFIRSTWEEKOFYEAR, "0")
 
 LOCVAL(LOCALE_SDAYNAME1,"lunes")
 LOCVAL(LOCALE_SDAYNAME2,"martes")
@@ -101,12 +101,20 @@ LOCVAL(LOCALE_SABBREVMONTHNAME13,"")
 
 LOCVAL(LOCALE_SPOSITIVESIGN, "")
 LOCVAL(LOCALE_SNEGATIVESIGN, "-")
-/* LOCVAL(LOCALE_IPOSSIGNPOSN, "") */
-/* LOCVAL(LOCALE_INEGSIGNPOSN, "") */
-/* LOCVAL(LOCALE_IPOSSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_IPOSSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_INEGSYMPRECEDES, "") */
-/* LOCVAL(LOCALE_INEGSEPBYSPACE, "") */
-/* LOCVAL(LOCALE_FONTSIGNATURE, "") */
+LOCVAL(LOCALE_IPOSSIGNPOSN, "1")
+LOCVAL(LOCALE_INEGSIGNPOSN, "1")
+LOCVAL(LOCALE_IPOSSYMPRECEDES, "0")
+LOCVAL(LOCALE_IPOSSEPBYSPACE, "1")
+LOCVAL(LOCALE_INEGSYMPRECEDES, "0")
+LOCVAL(LOCALE_INEGSEPBYSPACE, "1")
+LOCVAL(LOCALE_FONTSIGNATURE, "/")
 LOCVAL(LOCALE_SISO639LANGNAME,"es")
 LOCVAL(LOCALE_SISO3166CTRYNAME,"ES")
+
+LOCVAL(LOCALE_IDEFAULTEBCDICCODEPAGE, "20284")
+LOCVAL(LOCALE_IPAPERSIZE, "9")
+LOCVAL(LOCALE_SENGCURRNAME, "Spanish Peseta")
+LOCVAL(LOCALE_SNATIVECURRNAME, "Peseta")
+LOCVAL(LOCALE_SYEARMONTH, "MMMM' de 'yyyy")
+LOCVAL(LOCALE_SSORTNAME, "Default")
+LOCVAL(LOCALE_IDIGITSUBSTITUTION, """")