Commit in reactos/lib/comdlg32 on MAIN
cdlg_En.rc+73-11.3 -> 1.4
cdlg_Es.rc+318-721.1 -> 1.2
cdlg_Pt.rc+3-31.3 -> 1.4
filedlg.c+1-11.3 -> 1.4
winehq2ros.patch+1-261.1 -> 1.2
+396-103
5 modified files
Sync to Wine-20040408:
Robert Shearman <R.J.Shearman@warwick.ac.uk>
- Separate US English resources from English ones.
Jose Manuel Ferrer Ortiz <jmfo1982@yahoo.es>
- Updated Spanish translations.
Marcelo Duarte <wine-devel@bol.com.br>
- Minor updates in resource for Portuguese.
Rein Klazes <rklazes@xs4all.nl>
- Fix a possible null pointer crash in FILEDLG95_LOOKIN_Init.
reactos/lib/comdlg32
cdlg_En.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- cdlg_En.rc	23 Jan 2004 16:56:44 -0000	1.3
+++ cdlg_En.rc	15 Apr 2004 08:42:21 -0000	1.4
@@ -20,7 +20,7 @@

  * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
  */
 

-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

@@ -460,3 +460,75 @@

     IDS_COLOR_AQUA      "Aqua"
     IDS_COLOR_WHITE     "White"
 }

+
+
+/****************************************************************/
+/* English neutral resources
+/****************************************************************/
+
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Font"
+FONT 8, "Helv"
+{
+    LTEXT           "&Font:",stc1 ,6,3,40,9
+    COMBOBOX        cmb1, 6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Font St&yle:",stc2 ,108,3,44,9
+    COMBOBOX        cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Size:",stc3,179,3,30,9
+    COMBOBOX        cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Apply", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Help" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
+    GROUPBOX        "Effects",grp1,6,72,84,34,WS_GROUP
+    CHECKBOX	    "Stri&keout", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "&Underline", chx2, 10,94,50,10, BS_AUTOCHECKBOX
+    LTEXT           "&Colour:", stc4 ,6,110,30,9
+    COMBOBOX        cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Sample",grp2,98,72,120,36,WS_GROUP
+    CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+    LTEXT           "Scr&ipt:",stc7 ,98,114,40,9
+    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Colour"
+FONT 8, "Helv"
+{
+ LTEXT "&Basic Colours:",   1088, 4,    4,  140, 10
+ LTEXT "&Custom Colours:",  1089, 4,   106, 140, 10
+ LTEXT "Colour |  Sol&id",  1090, 150, 151,  48, 10
+ LTEXT   "&Red:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Green:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Blue:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Hue:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "OK",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Help", pshHelp,100,166, 44, 14
+ PUSHBUTTON "&Add to Custom Colours",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Define Custom Colours >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+}
reactos/lib/comdlg32
cdlg_Es.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- cdlg_Es.rc	9 Jan 2004 01:58:22 -0000	1.1
+++ cdlg_Es.rc	15 Apr 2004 08:42:21 -0000	1.2
@@ -1,5 +1,6 @@

 /*
  * Copyright 1995 Jon Tombs

+ * Copyright 2004 Jos� Manuel Ferrer Ortiz

  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

@@ -28,19 +29,19 @@

 FONT 8, "Helv"
 {
  LTEXT "Nombre de &archivo:", 1090, 6, 6, 76, 9

- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP

+ EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP

  LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
  LTEXT "&Directorios:", -1, 110, 6, 92, 9
  LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
  LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
  LTEXT "&Mostrar archivos de tipo:", 1089, 6, 104, 90, 9

- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP

+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP

  LTEXT "U&nidades:", 1091, 110, 104, 92, 9

- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP

+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP

  DEFPUSHBUTTON "Abrir", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP

- PUSHBUTTON "A&yuda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Solo lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP

+ PUSHBUTTON "A&yuda", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&S�lo lectura", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP

 }
 
 

@@ -50,19 +51,19 @@

 FONT 8, "Helv"
 {
  LTEXT "Nombre de &archivo:", 1090, 6, 6, 76, 9

- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP

+ EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP

  LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
  LTEXT "&Directorios:", -1, 110, 6, 92, 9
  LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
  LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
  LTEXT "&Mostrar archivos de tipo:", 1089, 6, 104, 90, 9

- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP

+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP

  LTEXT "U&nidades:", 1091, 110, 104, 92, 9

- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP

+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP

  DEFPUSHBUTTON "&Guardar como", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP

- PUSHBUTTON "A&yuda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Solo lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP

+ PUSHBUTTON "A&yuda", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&S�lo lectura", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP

 }
 
 

@@ -72,20 +73,20 @@

 FONT 8, "Helv"
 {
  LTEXT "Impresora:", 1088, 6, 6, 40, 9

- LTEXT "Campo de impresi�n", 1089, 60, 6, 150, 9
- GROUPBOX "", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Todo", 1056, 16, 45, 60, 12
- RADIOBUTTON "Selecc&i�n", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Paginas", 1058, 16, 75, 60, 12

+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Rango de impresi�n", grp1, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Todo", rad1, 16, 45, 60, 12
+ RADIOBUTTON "Selecc&i�n", rad2, 16, 60, 60, 12
+ RADIOBUTTON "&P�ginas", rad3, 16, 75, 60, 12

  DEFPUSHBUTTON "Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP

- PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP

+ PUSHBUTTON "&Configuraci�n", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP

  LTEXT "&Desde:", 1090, 60, 80, 30, 9
  LTEXT "&Hasta:", 1091, 120, 80, 30, 9
  LTEXT "Calidad de impre&si�n:", 1092, 6, 100, 76, 9

- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Impri&mir en un archivo", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Condensado", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP

+ COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Impri&mir en un archivo", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Condensado", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP

 }
 
 

@@ -94,24 +95,24 @@

 CAPTION "Configuraci�n de impresi�n"
 FONT 8, "Helv"
 {

- GROUPBOX "Impresora:", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "Pre&determinada del sistema", 1056, 16, 20, 80, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Impresora &especmfica:", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP

+ GROUPBOX "Impresora:", grp1, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "Pre&determinada del sistema", rad1, 16, 20, 80, 12
+ LTEXT "[ninguna]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Impresora &espec�fica:", rad2, 16, 50, 80, 12
+ COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP

  DEFPUSHBUTTON "Aceptar", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP

- PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientaci�n", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Vertical", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Horizontal", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papel", 1074, 120, 85, 180, 50, BS_GROUPBOX

+ PUSHBUTTON "&Configurar", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientaci�n", grp2, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Vertical", rad3, 50, 100, 40, 12
+ RADIOBUTTON "&Apaisado", rad4, 50, 115, 40, 12
+ ICON "LANDSCAP", stc10, 10, 95, 32, 32
+ ICON "PORTRAIT", stc11, 10, 95, 32, 32
+ GROUPBOX "Papel", grp3, 120, 85, 180, 50, BS_GROUPBOX

  LTEXT "&Tama�o", 1089, 130, 95, 30, 9
  LTEXT "O&rigen:", 1090, 130, 110, 30, 9

- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP

+ COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP

 }
 
 

@@ -120,28 +121,28 @@

 CAPTION "Fuente"
 FONT 8, "Helv"
 {

-    LTEXT           "&Fuente:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |

+    LTEXT           "&Fuente:",stc1 ,6,3,40,9
+    COMBOBOX        cmb1, 6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |

                     CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE

-    LTEXT           "Est&ilo de fuente:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |

+    LTEXT           "Est&ilo:",stc2 ,108,3,44,9
+    COMBOBOX        cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |

                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE

-    LTEXT           "&Tama�o:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |

+    LTEXT           "&Tama�o:",stc3,179,3,30,9
+    COMBOBOX        cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |

                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
     DEFPUSHBUTTON   "Aceptar",IDOK,218,6,40,14,WS_GROUP
     PUSHBUTTON      "Cancelar",IDCANCEL,218,23,40,14,WS_GROUP

-    PUSHBUTTON      "A&plicar", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "A&yuda" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "&Efectos",1072,6,72,84,34,WS_GROUP
-    CHECKBOX        "&Rayado", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX        "&Subrayado", 1041, 10,94,50,10, BS_AUTOCHECKBOX
-    LTEXT           "&Color:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |

+    PUSHBUTTON      "A&plicar", psh3,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "A&yuda" , pshHelp,218,57,40,14,WS_GROUP
+    GROUPBOX        "&Efectos",grp1,6,72,84,34,WS_GROUP
+    CHECKBOX        "&Tachado", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX        "&Subrayado", chx2, 10,94,50,10, BS_AUTOCHECKBOX
+    LTEXT           "&Color:", stc4 ,6,110,30,9
+    COMBOBOX        cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |

                     CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Ejemplo",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz��",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE

-    LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9

+    LTEXT           "Codificaci�n:",stc7 ,98,114,80,9

     COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
 		    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }

@@ -154,28 +155,28 @@

 {
  LTEXT "Colores &b�sicos:", 1088, 4, 4, 140, 10
  LTEXT "Colores person&alizados:", 1089, 4, 106, 140, 10

- LTEXT "Color|S�3l&ido", 1090, 150, 151, 48, 10

+ LTEXT "Color|S�l&ido", 1090, 150, 151, 48, 10

  LTEXT   "&Rojo:", 726 /*1094*/,249,126,24,10

- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP

+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP

  LTEXT   "&Verde:",727/*1095*/,249,140,24,10

- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP

+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP

  LTEXT   "A&zul:",728 /*1096*/,249,154,24,10

- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP

+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP

  LTEXT  "&Tinte:" ,723 /*1091*/,202,126,22,10

- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP

+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP

  LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10

- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP

+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP

  LTEXT  "&Lum.:" ,725 /*1093*/,202,154,22,10

- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP

+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP

  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28

- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116

+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116

  CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
  CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
  DEFPUSHBUTTON "Aceptar",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancelar", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP

- PUSHBUTTON "A&yuda", 1038,100,166, 44, 14
- PUSHBUTTON "Agregar a los &colores personalizados", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP

+ PUSHBUTTON "A&yuda", pshHelp,100,166, 44, 14
+ PUSHBUTTON "A�adir a &colores personalizados", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP

  PUSHBUTTON "&Definir colores personalizados >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i in "sol&id" */
 }

@@ -187,15 +188,15 @@

 FONT 8, "Helv"
 {
  LTEXT "Buscar:",  -1, 4, 8, 42, 8

- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Comparar palabra entera solamente", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&May�sculas/min�sculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Direcci�n", 1072, 107, 26, 68, 28
- CONTROL "A&rriba", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Abajo", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12

+ EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&S�lo palabra entera", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&May�sculas/min�sculas", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Direcci�n", grp1, 107, 26, 68, 28
+ CONTROL "A&rriba", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Abajo", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12

  DEFPUSHBUTTON "Buscar &siguiente", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancelar", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP

- PUSHBUTTON "A&yuda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP

+ PUSHBUTTON "A&yuda", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP

 }
 
 

@@ -205,14 +206,259 @@

 FONT 8, "Helv"
 {
  LTEXT "Buscar:", -1, 4, 9, 48, 8

- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Re&emplazar por:", 1090, -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Comparar palabra entera solamente", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&May�sculas/min�sculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP

+ EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Re&emplazar por:", -1, 4, 26, 48, 8
+ EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Comparar palabra entera solamente", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&May�sculas/min�sculas", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP

  DEFPUSHBUTTON "Reemplazar &siguiente", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP

- PUSHBUTTON "&Reemplazar", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Reemplazar &todo", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP

+ PUSHBUTTON "&Reemplazar", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Reemplazar &todo", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP

  PUSHBUTTON "Cancelar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP

- PUSHBUTTON "A&yuda", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP

+ PUSHBUTTON "A&yuda", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Imprimir"
+FONT 8, "Helv"
+{
+    DEFPUSHBUTTON   "Aceptar",  IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancelar", IDCANCEL, 232,164, 48,14, WS_GROUP
+    PUSHBUTTON      "&Ayuda",   pshHelp,  50, 161, 48,14, WS_GROUP
+
+    GROUPBOX        "Impresora",      grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "Imprimir a a&rchivo", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+    PUSHBUTTON      "&Propiedades",   psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Nombre:",       stc6,  16, 20,  36,8
+    COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Estado:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Tipo:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "D�nde:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Comentario:",    stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Copias",         grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "N�mero de &copias:",stc5,168,108,68,8
+    ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "C&ollate",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+    EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+
+    GROUPBOX        "Rango de impresi�n", grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "&Todo",          rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "P�&ginas",       rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "&Selecci�n",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+    EDITTEXT                          edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT                          edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
+    RTEXT           "&desde:",        stc2,  52,124,  20,8
+    RTEXT           "&hasta:",        stc3, 100,124,  16,8
+}
+
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Configuraci�n de impresi�n"
+FONT 8, "Helv"
+BEGIN
+    DEFPUSHBUTTON   "Aceptar",IDOK,180,156,48,14,WS_GROUP
+    PUSHBUTTON      "Cancelar",IDCANCEL,232,156,48,14
+/*    PUSHBUTTON      "Network...", psh5, 284,156,48,14 */
+
+    GROUPBOX        "Impresora",      grp4,   8,  4, 272,84, WS_GROUP
+    PUSHBUTTON      "&Propiedades",   psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Nombre:",       stc6,  16, 20,  36,8
+    COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Estado:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Tipo:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "D�nde:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Comentario:",    stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Papel",          grp2,   8, 92, 164,56, WS_GROUP
+    LTEXT           "&Tama�o:",       stc2,  16,108,  36, 8
+    COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "&Origen:",       stc3,  16,128,  36, 8
+    COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+
+    GROUPBOX        "Orientaci�n",    grp1, 180, 92, 100,56, WS_GROUP
+    ICON            "",               ico1, 195,112,  18,20, WS_GROUP
+    CONTROL         "&Vertical",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "A&paisado",      rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+END
+
+PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "P�gina de configuraci�n"
+FONT 8, "Helv"
+BEGIN
+  CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80,  SS_WHITERECT
+  CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
+  CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4,  SS_GRAYRECT
+  GROUPBOX "Papel", grp2, 8, 96, 224, 56, BS_GROUPBOX
+  LTEXT "&Tama�o:", stc2, 16, 112, 36, 8
+  COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  LTEXT "&Bandeja:", stc3, 16, 132, 36, 8
+  COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  GROUPBOX "Orientaci�n", grp1, 8, 156, 64, 56, BS_GROUPBOX
+  AUTORADIOBUTTON "&Vertical", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "&Apaisado", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+  GROUPBOX "M�rgenes", grp4, 80, 156, 152, 56, BS_GROUPBOX
+  LTEXT "I&zquierdo:", stc15, 88, 172, 21, 8
+  EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "&Derecho:", stc16, 159, 172, 27, 8
+  EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "&Superior:", stc17, 88, 192, 21, 8
+  EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "In&ferior:", stc18, 159, 192, 23, 8
+  EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  DEFPUSHBUTTON "Aceptar", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
+  PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14
+  PUSHBUTTON "&Impresora...", psh3, 184, 220, 48, 14
+END
+
+NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
+CAPTION "Abrir"
+FONT 8, "Helv"
+{
+    LTEXT	"Mirar &en:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
+    COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT	"" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
+    LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+
+    LTEXT	"Nombre de &archivo:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+    EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
+
+    LTEXT	"Archivos de &tipo:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+    COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+
+    CONTROL	"Abrir como &s�lo-lectura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+
+    DEFPUSHBUTTON	"&Abrir",		 IDOK,222,110,50,14
+    PUSHBUTTON		"Cancelar",		 IDCANCEL,222,128,50,14
+    PUSHBUTTON		"&Ayuda",		 pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_ABOUTBOX            "&Acerca del test FolderPicker"
+    IDS_DOCUMENTFOLDERS     "Carpetas de documentos"
+    IDS_PERSONAL            "Mis Documentos"
+    IDS_FAVORITES           "Mis Favoritos"
+    IDS_PATH                "Ruta del sistema"
+    IDS_DESKTOP             "Escritorio"
+    IDS_FONTS               "Fuentes"
+    IDS_MYCOMPUTER          "Mi PC"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_SYSTEMFOLDERS       "Carpetas del sistema"
+    IDS_LOCALHARDRIVES      "Discos duros locales"
+    IDS_FILENOTFOUND        "Archivo no encontrado"
+    IDS_VERIFYFILE          "Compruebe que haya dado el nombre de archivo correcto"
+    IDS_CREATEFILE          "El archivo no existe\n�Desea crearlo?"
+    IDS_OVERWRITEFILE       "El archivo ya existe.\n�Desea reemplazarlo?"
+    IDS_INVALID_FILENAME_TITLE "Caracter(es) inv�lidos en la ruta"
+    IDS_INVALID_FILENAME    "Un nombre de archivo no puede contener ninguno de los siguientes caracteres: \n                          / : < > |"
+    IDS_PATHNOTEXISTING     "La ruta no existe"
+    IDS_FILENOTEXISTING     "El archivo no existe"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_UPFOLDER         "Subir un nivel"
+    IDS_NEWFOLDER        "Crear nueva carpeta"
+    IDS_LISTVIEW         "Lista"
+    IDS_REPORTVIEW       "Detalles"
+    IDS_TODESKTOP        "Explorar el escritorio"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    PD32_PRINT_TITLE       "Imprimir"
+
+    PD32_VALUE_UREADABLE                  "Entrada ilegible"
+    PD32_INVALID_PAGE_RANGE "Este valor no concuerda con el rango de la \
+p�gina.\n\ Por favor, introduzca un valor entre %d y %d."
+    PD32_FROM_NOT_ABOVE_TO                "La entrada 'desde' no puede exceder \
+a la entrada 'hasta'."
+    PD32_MARGINS_OVERLAP                  "Los m�rgenes overlap o fall outside \
+los boundaries del papel.\nPor favor, reintroduzca los m�rgenes."
+    PD32_NR_OF_COPIES_EMPTY               "El n�mero del valor 'N�mero de \
+copias' no puede estar vac�o."
+    PD32_TOO_LARGE_COPIES                 "Este n�mero tan grande de copias no \
+es soportado por su impresora.\nPor favor, introduzca un valor entre 1 y %d."
+    PD32_PRINT_ERROR                      "Ocurri� un error en la impresora."
+    PD32_NO_DEFAULT_PRINTER               "Ninguna impresora definida por \
+defecto."
+    PD32_CANT_FIND_PRINTER                "No se encuentra la impresora."
+    PD32_OUT_OF_MEMORY                    "Sin memoria."
+    PD32_GENERIC_ERROR                    "Ocurri� un error."
+    PD32_DRIVER_UNKNOWN                   "Manejador de la impresora \
+desconocido."
+
+    PD32_DEFAULT_PRINTER                  "Impresora por defecto; "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "Hay %d documentos en la cola"
+    PD32_PRINT_ALL_X_PAGES                "&Todas las %d p�ginas"
+    PD32_MARGINS_IN_INCHES                "M�rgenes [pulgadas]"
+    PD32_MARGINS_IN_MILIMETERS            "M�rgenes [mm]"
+    PD32_MILIMETERS                       "mm"
+
+    PD32_PRINTER_STATUS_READY             "Lista"
+    PD32_PRINTER_STATUS_PAUSED            "Pausada; "
+    PD32_PRINTER_STATUS_ERROR             "Error; "
+    PD32_PRINTER_STATUS_PENDING_DELETION  "Borrado pendiente; "
+    PD32_PRINTER_STATUS_PAPER_JAM         "Paper jam; "
+    PD32_PRINTER_STATUS_PAPER_OUT         "Sin papel; "
+    PD32_PRINTER_STATUS_MANUAL_FEED       "Ponga papel a mano; "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Problema con el papel; "
+    PD32_PRINTER_STATUS_OFFLINE           "Impresora apagada; "
+    PD32_PRINTER_STATUS_IO_ACTIVE         "E/S activa; "
+    PD32_PRINTER_STATUS_BUSY              "Ocupada; "
+    PD32_PRINTER_STATUS_PRINTING          "Imprimiendo; "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "La bandeja de salida est� llena; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "No disponible; "
+    PD32_PRINTER_STATUS_WAITING           "Esperando; "
+    PD32_PRINTER_STATUS_PROCESSING        "Procesando; "
+    PD32_PRINTER_STATUS_INITIALIZING      "Inicializando; "
+    PD32_PRINTER_STATUS_WARMING_UP        "Calent�donse; "
+    PD32_PRINTER_STATUS_TONER_LOW         "T�ner bajo; "
+    PD32_PRINTER_STATUS_NO_TONER          "Sin t�ner; "
+    PD32_PRINTER_STATUS_PAGE_PUNT         "Page punt; "
+    PD32_PRINTER_STATUS_USER_INTERVENTION "Interrumpido por el usuario; "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Sin memoria; "
+    PD32_PRINTER_STATUS_DOOR_OPEN         "La puerta de la impresora est� \
+abierta; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Servidor de impresi�n desconocido; "
+    PD32_PRINTER_STATUS_POWER_SAVE        "Modo de ahorro de energ�a; "
+}
+
+STRINGTABLE DISCARDABLE /* Color names */
+{
+    IDS_COLOR_BLACK     "Negro"
+    IDS_COLOR_MAROON    "Marr�n"
+    IDS_COLOR_GREEN     "Verde"
+    IDS_COLOR_OLIVE     "Oliva"
+    IDS_COLOR_NAVY      "Azul marino"
+    IDS_COLOR_PURPLE    "Morado"
+    IDS_COLOR_TEAL      "Teal"
+    IDS_COLOR_GRAY      "Gris"
+    IDS_COLOR_SILVER    "Plateado"
+    IDS_COLOR_RED       "Rojo"
+    IDS_COLOR_LIME      "Lima"
+    IDS_COLOR_YELLOW    "Amarillo"
+    IDS_COLOR_BLUE      "Azul"
+    IDS_COLOR_FUCHSIA   "Fucsia"
+    IDS_COLOR_AQUA      "Agua"
+    IDS_COLOR_WHITE     "Blanco"

 }
reactos/lib/comdlg32
cdlg_Pt.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- cdlg_Pt.rc	23 Jan 2004 16:56:44 -0000	1.3
+++ cdlg_Pt.rc	15 Apr 2004 08:42:21 -0000	1.4
@@ -124,7 +124,7 @@

     LTEXT           "&Fonte:",1088 ,6,3,40,9
     COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE

-    LTEXT           "&Estilo da Fonte:",1089 ,108,3,44,9

+    LTEXT           "&Estilo da Fonte:",1089 ,108,3,50,9

     COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
     LTEXT           "&Tamanho:",1090,179,3,30,9

@@ -140,7 +140,7 @@

     LTEXT           "&Cor:", 1091 ,6,110,30,9
     COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
 		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP

-    GROUPBOX        "Amostra",grp2,98,72,120,36,WS_GROUP

+    GROUPBOX        "Exemplo",grp2,98,72,120,36,WS_GROUP

     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
     COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |

@@ -340,7 +340,7 @@

     LTEXT	"&Nome do arquivo:",IDC_FILENAMESTATIC,5,112,48,16, SS_NOTIFY
     EDITTEXT	IDC_FILENAME,54,111,155,12,ES_AUTOHSCROLL
 

-    LTEXT	"Arquivos do &tipo",IDC_FILETYPESTATIC,5,131,48,16, SS_NOTIFY

+    LTEXT	"Arquivos do &tipo:",IDC_FILETYPESTATIC,5,131,48,16, SS_NOTIFY

     COMBOBOX	IDC_FILETYPE,54,129,155,100,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
 
     CONTROL	"Abrir como &somente-leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10
reactos/lib/comdlg32
filedlg.c 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- filedlg.c	11 Mar 2004 21:15:50 -0000	1.3
+++ filedlg.c	15 Apr 2004 08:42:21 -0000	1.4
@@ -2366,9 +2366,9 @@

       }
       IEnumIDList_Release(lpeRoot);
     }

+    IShellFolder_Release(psfRoot);

   }
 

-  IShellFolder_Release(psfRoot);

   COMDLG32_SHFree(pidlDrives);
   return NOERROR;
 }
reactos/lib/comdlg32
winehq2ros.patch 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- winehq2ros.patch	11 Mar 2004 21:15:50 -0000	1.1
+++ winehq2ros.patch	15 Apr 2004 08:42:21 -0000	1.2
@@ -1,35 +1,10 @@

-Index: filetitle.c
-===================================================================
-RCS file: /home/wine/wine/dlls/commdlg/filetitle.c,v
-retrieving revision 1.15
-diff -u -r1.15 filetitle.c
---- filetitle.c	5 Sep 2003 23:08:42 -0000	1.15
-+++ filetitle.c	11 Mar 2004 21:21:49 -0000
-@@ -40,7 +40,7 @@
-  *	GetFileTitleA		(COMDLG32.@)
-  *
-  */
--short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, UINT cbBuf)
-+short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf)
- {
-     int ret;
-     UNICODE_STRING strWFile;
-@@ -60,7 +60,7 @@
-  *	GetFileTitleW		(COMDLG32.@)
-  *
-  */
--short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, UINT cbBuf)
-+short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf)
- {
- 	int i, len;
-         static const WCHAR brkpoint[] = {'*','[',']',0};

 Index: printdlg.c
 ===================================================================
 RCS file: /home/wine/wine/dlls/commdlg/printdlg.c,v
 retrieving revision 1.74
 diff -u -r1.74 printdlg.c
 --- printdlg.c	9 Jan 2004 05:10:35 -0000	1.74

-+++ printdlg.c	11 Mar 2004 21:21:50 -0000

++++ printdlg.c	15 Apr 2004 08:51:04 -0000

 @@ -341,7 +341,7 @@
  	        lpdm->dmCollate =
  		  (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
CVSspam 0.2.8