Commit in reactos/lib/comdlg32 on MAIN
cdlg_It.rc+1-11.3 -> 1.4
cdlg_Uk.rc+236-2361.1 -> 1.2
filedlg.c+68-221.5 -> 1.6
filedlg16.c+1-11.3 -> 1.4
winehq2ros.patch+14-141.3 -> 1.4
+320-274
5 modified files
Sync to Wine-20040615:
Ivan Leo Puoti <puoti@inwind.it>
- Changed my name, so update copyright info.
Ilya Korniyko <k_ilya@ukr.net>
- Encoding fixes in Ukrainian translation.
Wolfgang Schwotzer <wolfgang.schwotzer@gmx.net>
- Support lpstrCustomFilter and return nFilterIndex in file dialog.
Rein Klazes <rklazes@xs4all.nl>
- In FILEDLG_ScanDir do not try to set the current directory to a path
  that is empty.

reactos/lib/comdlg32
cdlg_It.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- cdlg_It.rc	8 May 2004 12:53:14 -0000	1.3
+++ cdlg_It.rc	16 Jun 2004 06:54:39 -0000	1.4
@@ -1,6 +1,6 @@
 /*
  * Copyright 1996 Tristan Tarrant
- * Copyright 2004 Ivan Leo Murray-Smith
+ * Copyright 2004 Ivan Leo Puoti
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

reactos/lib/comdlg32
cdlg_Uk.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- cdlg_Uk.rc	8 May 2004 12:53:14 -0000	1.1
+++ cdlg_Uk.rc	16 Jun 2004 06:54:39 -0000	1.2
@@ -24,92 +24,92 @@
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "�&#1110;������"
+CAPTION "��������"
 FONT 8, "Ms Sans Serif"
 {
- LTEXT "&&#1030;�'� �����:", 1090, 6, 6, 76, 9
+ LTEXT "&��'� �����:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 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 "&����:", -1, 110, 6, 92, 9
+ LTEXT "&����:", -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 "���������� ����� &����:", 1089, 6, 104, 90, 9
+ LTEXT "���������� ����� &����:", 1089, 6, 104, 90, 9
  COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&�����:", 1091, 110, 104, 92, 9
+ LTEXT "&�����:", 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
- DEFPUSHBUTTON "�&#1110;������", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "�&#1110;��&#1110;��", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&���&#1110;���", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&���� ��� �������", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE  | WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "��������", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "�������", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&�������", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&���� ��� �������", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE  | WS_GROUP | WS_TABSTOP
 }
 
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "�������� �� ..."
+CAPTION "�������� �� ..."
 FONT 8, "Ms Sans Serif"
 {
- LTEXT "&&&#1030;�'� �����:", 1090, 6, 6, 76, 9
+ LTEXT "&&��'� �����:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 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 "&����:", -1, 110, 6, 92, 9
+ LTEXT "&����:", -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 "���������� ����� &����:", 1089, 6, 104, 90, 9
+ LTEXT "���������� ����� &����:", 1089, 6, 104, 90, 9
  COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&�����:", 1091, 110, 104, 92, 9
+ LTEXT "&�����:", 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
- DEFPUSHBUTTON "�������� ��", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "�&#1110;��&#1110;��", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&���&#1110;���", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&���� ��� �������", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "�������� ��", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "�������", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&�������", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&���� ��� �������", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | WS_GROUP | WS_TABSTOP
 }
 
 
 PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "����"
+CAPTION "����"
 FONT 8, "Ms Sans Serif"
 {
- LTEXT "�������:", 1088, 6, 6, 40, 9
+ LTEXT "�������:", 1088, 6, 6, 40, 9
  LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "���������", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&���", 1056, 16, 45, 60, 12
- RADIOBUTTON "�&��&#1110;������ ��������", 1057, 16, 60, 60, 12
- RADIOBUTTON "&����&#1110;���", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "����", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "�&#1110;��&#1110;��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "����������&#1110;", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&�:", 1090, 60, 80, 30, 9
- LTEXT "&��:", 1091, 120, 80, 30, 9
- LTEXT "&��&#1110;��� �����:", 1092, 6, 100, 76, 9
+ GROUPBOX "���������", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&���", 1056, 16, 45, 60, 12
+ RADIOBUTTON "�&��������� ��������", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&��������", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "����", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "�������", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "�����������", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&�:", 1090, 60, 80, 30, 9
+ LTEXT "&��:", 1091, 120, 80, 30, 9
+ LTEXT "&������ �����:", 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 "���� �� �����", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "������", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "���� �� �����", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "������", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
 PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "��������� ��������"
+CAPTION "��������� ��������"
 FONT 8, "Ms Sans Serif"
 {
- GROUPBOX "�������", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "������� �� &������������", 1056, 16, 20, 80, 12
- LTEXT "[����]", 1088, 35, 35, 120, 9
- RADIOBUTTON "&&#1030;���� �������", 1057, 16, 50, 80, 12
+ GROUPBOX "�������", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "������� �� &������������", 1056, 16, 20, 80, 12
+ LTEXT "[����]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "&����� �������", 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
  DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "�&#1110;��&#1110;��", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&���������", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "��&#1110;&#1108;����&#1110;�", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&������", 1058, 50, 100, 40, 12
- RADIOBUTTON "&��������", 1059, 50, 115, 40, 12
+ PUSHBUTTON "�������", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&���������", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "����������", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&������", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&��������", 1059, 50, 115, 40, 12
  ICON "LANDSCAP", 1097, 10, 95, 32, 32
  ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "���&#1110;�", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "��&��&#1110;�", 1089, 130, 95, 30, 9
- LTEXT "&�������", 1090, 130, 110, 30, 9
+ GROUPBOX "�����", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "��&����", 1089, 130, 95, 30, 9
+ LTEXT "&�������", 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
 }
@@ -117,31 +117,31 @@
 
 CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "�����"
+CAPTION "�����"
 FONT 8, "Ms Sans Serif"
 {
-    LTEXT           "&�����:",1088 ,6,3,40,9
+    LTEXT           "&�����:",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           "&�����:",1089 ,108,3,44,9
+    LTEXT           "&�����:",1089 ,108,3,44,9
     COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&����&#1110;�:",1090,179,3,30,9
+    LTEXT           "&������:",1090,179,3,30,9
     COMBOBOX        1138,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      "�&#1110;��&#1110;��",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&�����������", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&���&#1110;���" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
-    GROUPBOX        "��������",1072,6,72,84,34,WS_GROUP
-    CHECKBOX	    "&�����������", 1040, 10,82,75,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "&�&#1110;����������", 1041, 10,94,75,10, BS_AUTOCHECKBOX
-    LTEXT           "&���&#1110;�:", 1091 ,6,110,30,9
+    PUSHBUTTON      "�������",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&�����������", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&�������" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
+    GROUPBOX        "��������",1072,6,72,84,34,WS_GROUP
+    CHECKBOX	    "&�����������", 1040, 10,82,75,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "&������������", 1041, 10,94,75,10, BS_AUTOCHECKBOX
+    LTEXT           "&�����:", 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        "&������",grp2,98,72,120,36,WS_GROUP
-    CTEXT           "����AaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
-    LTEXT           "������:",stc7 ,98,114,80,9
+    GROUPBOX        "&������",grp2,98,72,120,36,WS_GROUP
+    CTEXT           "����AaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+    LTEXT           "������:",stc7 ,98,114,80,9
     COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
 		    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
@@ -149,23 +149,23 @@
 
 CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 310, 185
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "��&#1110;�� ���&#1110;���"
+CAPTION "����� �������"
 FONT 8, "Ms Sans Serif"
 {
- LTEXT "&������ ���&#1110;���:",   1088, 4,    4,  140, 10
- LTEXT "�&�������&#1110; �������:",  1089, 4,   106, 140, 10
- LTEXT "���&#1110;�|��&�����",  1090, 150, 151,  48, 10
- LTEXT   "&��������:", 726 /*1094*/,254,126,32,10
+ LTEXT "&������ �������:",   1088, 4,    4,  140, 10
+ LTEXT "�&�������� �������:",  1089, 4,   106, 140, 10
+ LTEXT "�����|��&�����",  1090, 150, 151,  48, 10
+ LTEXT   "&��������:", 726 /*1094*/,254,126,32,10
  EDITTEXT 706, 288,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&�������:",727/*1095*/,254,140,32,10
+ LTEXT   "&�������:",727/*1095*/,254,140,32,10
  EDITTEXT 707, 288,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "�&��&#1110;�:",728 /*1096*/,264,154,24,10
+ LTEXT   "�&����:",728 /*1096*/,264,154,24,10
  EDITTEXT 708, 288,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "�&#1110;�&�&#1110;���:" ,723 /*1091*/,202,126,30,10
+ LTEXT  "���&�����:" ,723 /*1091*/,202,126,30,10
  EDITTEXT 703, 234,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&��������:" ,724 /*1092*/,199,140,34,10
+ LTEXT  "&��������:" ,724 /*1092*/,199,140,34,10
  EDITTEXT 704, 234,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&������&#1110;���:" ,725 /*1093*/,202,154,30,10
+ LTEXT  "&����������:" ,725 /*1093*/,202,154,30,10
  EDITTEXT 705, 234,152,18,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
@@ -173,258 +173,258 @@
  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",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "�&#1110;��&#1110;��", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "���&#1110;���", 1038,100,166, 44, 14
- PUSHBUTTON "&������ �� ������",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&��������� ���&#1110;� >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "�������", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "�������", 1038,100,166, 44, 14
+ PUSHBUTTON "&������ �� ������",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&��������� ����� >>", 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"  */
 }
 
 
 FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 245, 62
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "�����"
+CAPTION "�����"
 FONT 8, "Ms Sans Serif"
 {
- LTEXT "&������:", -1, 4, 8, 42, 8
+ LTEXT "&������:", -1, 4, 8, 42, 8
  EDITTEXT 1152, 47, 7, 138, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&���� ����� �&#1110;����", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "���&#1110;� &��&#1169;&#1110;����", 1041, 4, 42, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "������", 1072, 107, 26, 78, 28
- CONTROL "&�����", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 40, 12
- CONTROL "�&���", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 38, 30, 12
-
- DEFPUSHBUTTON "�&����� ���&#1110;", IDOK, 190,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "�&#1110;��&#1110;��", IDCANCEL	 , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&���&#1110;���", pshHelp	 , 190, 45, 50, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&���� ����� ������", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "����� &��������", 1041, 4, 42, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "������", 1072, 107, 26, 78, 28
+ CONTROL "&�����", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 40, 12
+ CONTROL "�&���", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 38, 30, 12
+
+ DEFPUSHBUTTON "�&����� ����", IDOK, 190,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "�������", IDCANCEL	 , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&�������", pshHelp	 , 190, 45, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 
 REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "���&#1110;��"
+CAPTION "������"
 FONT 8, "Ms Sans Serif"
 {
- LTEXT "&������:", -1, 4, 9, 48, 8
+ LTEXT "&������:", -1, 4, 9, 48, 8
  EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "�&��&#1110;���� ��:", -1, 4, 26, 48, 8
+ LTEXT "�&������� ��:", -1, 4, 26, 48, 8
  EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&���� ����� �&#1110;����", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "���&#1110;� &��&#1169;&#1110;����", 1041, 5, 62, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "&���� ����� ������", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "����� &��������", 1041, 5, 62, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 
- DEFPUSHBUTTON "�&����� ���&#1110;", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "&���&#1110;����", psh1	 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "���&#1110;���� &���", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "�&#1110;��&#1110;��", IDCANCEL	 , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&���&#1110;���", pshHelp	 , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "�&����� ����", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "&��������", psh1	 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "�������� &���", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "�������", IDCANCEL	 , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&�������", 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 "����"
+CAPTION "����"
 FONT 8, "Ms Sans Serif"
 {
     DEFPUSHBUTTON   "OK",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
-    PUSHBUTTON      "�&#1110;��&#1110;��", IDCANCEL, 232,164, 48,14, WS_GROUP
-    PUSHBUTTON      "&���&#1110;���",  pshHelp,  50, 161, 48,14, WS_GROUP
+    PUSHBUTTON      "�������", IDCANCEL, 232,164, 48,14, WS_GROUP
+    PUSHBUTTON      "&�������",  pshHelp,  50, 161, 48,14, WS_GROUP
 
-    GROUPBOX        "�������",        grp4,   8,  4, 272,84, WS_GROUP
-    CONTROL         "���� � ���&�", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
-    PUSHBUTTON      "&����������&#1110;",    psh2, 212, 17,  60,14, WS_GROUP
-    LTEXT           "&&#1030;�'�:",         stc6,  16, 20,  36,8
+    GROUPBOX        "�������",        grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "���� � ���&�", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+    PUSHBUTTON      "&�����������",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&��'�:",         stc6,  16, 20,  36,8
     COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "������:",        stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "����������",    stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "���:",          stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "����������",     stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "�&#1110;���:",         stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "����������", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "����&#1110;���:",       stc13,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "����������",   stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "������:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "����������",    stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "���:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "����������",     stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "�����:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "����������", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "��������:",       stc13,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "����������",   stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
-    GROUPBOX        "���&#1110;&#1111;",         grp2, 160, 92, 120,64, WS_GROUP
-    LTEXT           "����� &���&#1110;�:",stc5,168,108,68,8
+    GROUPBOX        "�����",         grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "����� &�����:",stc5,168,108,68,8
     ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
-    CONTROL         "&�������",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,40,12
+    CONTROL         "&�������",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,40,12
     EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
 
-    GROUPBOX        "���������",    grp1,   8,92,  144,64, WS_GROUP
-    CONTROL         "&���",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
-    CONTROL         "&����&#1110;���",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,50,12
-    CONTROL         "&���&#1110;�����",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+    GROUPBOX        "���������",    grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "&���",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "&��������",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,50,12
+    CONTROL         "&���������",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
     EDITTEXT                          edt1,  85,122,  20,12, WS_GROUP | ES_NUMBER
     EDITTEXT                          edt2, 120,122,  20,12, WS_GROUP | ES_NUMBER
-    RTEXT           "&�&#1110;�:",         stc2,  70,124,  10,8
-    RTEXT           "&��:",           stc3, 106,124,  10,8
+    RTEXT           "&���:",         stc2,  70,124,  10,8
+    RTEXT           "&��:",           stc3, 106,124,  10,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 "��������� ��������"
+CAPTION "��������� ��������"
 FONT 8, "Ms Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "�&#1110;��&#1110;��",IDCANCEL,232,156,48,14
-/*    PUSHBUTTON      "�&#1110;���...", psh5, 284,156,48,14 */
+    PUSHBUTTON      "�������",IDCANCEL,232,156,48,14
+/*    PUSHBUTTON      "�����...", psh5, 284,156,48,14 */
 
-    GROUPBOX        "�������",        grp4,   8,  4, 272,84, WS_GROUP
-    PUSHBUTTON      "&����������&#1110;",    psh2, 212, 17,  60,14, WS_GROUP
-    LTEXT           "&&#1030;�'�:",         stc6,  16, 20,  36,8
+    GROUPBOX        "�������",        grp4,   8,  4, 272,84, WS_GROUP
+    PUSHBUTTON      "&�����������",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&��'�:",         stc6,  16, 20,  36,8
     COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "������:",        stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "����������",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "���:",          stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "����������",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "�&#1110;���:",         stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "����������", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "����&#1110;���:",       stc9,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "���������&#1110;",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "������:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "����������",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "���:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "����������",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "�����:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "����������", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "��������:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "����������",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
-    GROUPBOX        "���&#1110;�",          grp2,   8, 92, 164,56, WS_GROUP
-    LTEXT           "���&�&#1110;�:",         stc2,  16,108,  36, 8
+    GROUPBOX        "�����",          grp2,   8, 92, 164,56, WS_GROUP
+    LTEXT           "���&���:",         stc2,  16,108,  36, 8
     COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&�������:",       stc3,  16,128,  36, 8
+    LTEXT           "&�������:",       stc3,  16,128,  36, 8
     COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
 
-    GROUPBOX        "��&#1110;&#1108;����&#1110;�",    grp1, 180, 92, 100,56, WS_GROUP
+    GROUPBOX        "����������",    grp1, 180, 92, 100,56, WS_GROUP
     ICON            "",               ico1, 195,112,  18,20, WS_GROUP
-    CONTROL         "&�������",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
-    CONTROL         "�&�������",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+    CONTROL         "&�������",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "�&�������",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
 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 "�&#1110;������"
+CAPTION "��������"
 FONT 8, "MS Sans Serif"
 {
-    LTEXT	"������ &�",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
+    LTEXT	"������ &�",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	"&#1030;�'� &�����:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+    LTEXT	"��'� &�����:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
     EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
 
-    LTEXT	"����� &����",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
-    COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT	"����� &����",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+    COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
 
-    CONTROL	"���� ��� &�������",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+    CONTROL	"���� ��� &�������",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
 
-    DEFPUSHBUTTON	"&�&#1110;������",		 IDOK,222,110,50,14
-    PUSHBUTTON		"�&#1110;��&#1110;��",		 IDCANCEL,222,128,50,14
-    PUSHBUTTON		"&���&#1110;���",		 pshHelp,222,145,50,14
+    DEFPUSHBUTTON	"&��������",		 IDOK,222,110,50,14
+    PUSHBUTTON		"�������",		 IDCANCEL,222,128,50,14
+    PUSHBUTTON		"&�������",		 pshHelp,222,145,50,14
 }
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_ABOUTBOX            "&��� ���� ���&#1110;�����"
-    IDS_DOCUMENTFOLDERS     "���� ��������&#1110;�"
-    IDS_PERSONAL            "��&#1111; ���������"
-    IDS_FAVORITES           "��������"
-    IDS_PATH                "��������� ����"
-    IDS_DESKTOP             "��&#1110;������"
-    IDS_FONTS               "������"
-    IDS_MYCOMPUTER          "�&#1110;� ����'����"
+    IDS_ABOUTBOX            "&��� ���� ���������"
+    IDS_DOCUMENTFOLDERS     "���� ����������"
+    IDS_PERSONAL            "��� ���������"
+    IDS_FAVORITES           "��������"
+    IDS_PATH                "��������� ����"
+    IDS_DESKTOP             "���������"
+    IDS_FONTS               "������"
+    IDS_MYCOMPUTER          "��� ����'����"
 }
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_SYSTEMFOLDERS       "�������&#1110; ����"
-    IDS_LOCALHARDRIVES      "�������&#1110; ������&#1110; �����"
-    IDS_FILENOTFOUND        "���� �� ��������"
-    IDS_VERIFYFILE          "�����&#1110;���, �� ��������� ������� &#1110;�'� �����"
-    IDS_CREATEFILE          "���� �� &#1110;���&#1108;\n�� ������ �� ���� ��������?"
-    IDS_OVERWRITEFILE       "���� ��� &#1110;���&#1108;.\n���&#1110;���� ����?"
-    IDS_INVALID_FILENAME_TITLE "���&#1110;���� ������ � ������ �����"
-    IDS_INVALID_FILENAME    "&#1030;�'� ����� �� ���� �&#1110;����� �������&#1110; �������: \n                          / : < > |"
-    IDS_PATHNOTEXISTING     "���� �� &#1110;���&#1108;"
-    IDS_FILENOTEXISTING     "���� �� &#1110;���&#1108;"
+    IDS_SYSTEMFOLDERS       "�������� ����"
+    IDS_LOCALHARDRIVES      "�������� ������� �����"
+    IDS_FILENOTFOUND        "���� �� ��������"
+    IDS_VERIFYFILE          "���������, �� ��������� ������� ��'� �����"
+    IDS_CREATEFILE          "���� �� �����\n�� ������ �� ���� ��������?"
+    IDS_OVERWRITEFILE       "���� ��� �����.\n�������� ����?"
+    IDS_INVALID_FILENAME_TITLE "�������� ������ � ������ �����"
+    IDS_INVALID_FILENAME    "��'� ����� �� ���� ������� �������� �������: \n                          / : < > |"
+    IDS_PATHNOTEXISTING     "���� �� �����"
+    IDS_FILENOTEXISTING     "���� �� �����"
 }
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_UPFOLDER         "����� �� ���� �&#1110;����"
-    IDS_NEWFOLDER        "�������� ���� ����"
-    IDS_LISTVIEW         "������"
-    IDS_REPORTVIEW       "��������&#1110;"
-    IDS_TODESKTOP        "�����&#1110;� �� ��&#1110;������"
+    IDS_UPFOLDER         "����� �� ���� ������"
+    IDS_NEWFOLDER        "�������� ���� ����"
+    IDS_LISTVIEW         "������"
+    IDS_REPORTVIEW       "���������"
+    IDS_TODESKTOP        "������� �� ���������"
 }
 
 STRINGTABLE DISCARDABLE
 {
-    PD32_PRINT_TITLE       "����"
+    PD32_PRINT_TITLE       "����"
 
-    PD32_VALUE_UREADABLE                  "������&#1108;��� �������"
-    PD32_INVALID_PAGE_RANGE "�� �������� �� ������ � �&#1110;������&#1110; ����&#1110;���\n\
-����&#1110;�� �������� �&#1110;� %d �� %d"
-    PD32_FROM_NOT_ABOVE_TO                "�������� �&#1030;� �� ������� ������������ ��:"
-    PD32_MARGINS_OVERLAP                  "���&#1110; ������������ �� ����������� \
-����&#1110;�� ������.\n����&#1110;�� &#1111;� ������"
-    PD32_NR_OF_COPIES_EMPTY               "�������� ����� ���&#1110;� �� ���� ���� \
-������"
-    PD32_TOO_LARGE_COPIES                 "���� ������ �&#1110;���&#1110;��� ���&#1110;� �� \
-���� ���� ����������� ����� ���������.\n����&#1110;�� �������� �&#1110;� 1 �� %d"
-    PD32_PRINT_ERROR                      "������� ������� ��������"
-    PD32_NO_DEFAULT_PRINTER               "����&#1108; ��������, ������������ �� ������������"
-    PD32_CANT_FIND_PRINTER                "�� ������� ������ �������"
-    PD32_OUT_OF_MEMORY                    "���� ���'��&#1110;"
-    PD32_GENERIC_ERROR                    "�������(�) �������(�)"
-    PD32_DRIVER_UNKNOWN                   "���&#1110;����� ������� ��������"
-
-    PD32_DEFAULT_PRINTER                  "������� �� ������������; "
-    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "%d ��������&#1110;� � ����&#1110;"
-    PD32_PRINT_ALL_X_PAGES                "&��&#1110; %d ����&#1110;���"
-    PD32_MARGINS_IN_INCHES                "���&#1110;  [�����]"
-    PD32_MARGINS_IN_MILIMETERS            "���&#1110; [��]"
-    PD32_MILIMETERS                       "��"
-
-    PD32_PRINTER_STATUS_READY             "������"
-    PD32_PRINTER_STATUS_PAUSED            "�����������; "
-    PD32_PRINTER_STATUS_ERROR             "�������; "
-    PD32_PRINTER_STATUS_PENDING_DELETION  "������� ���������; "
-    PD32_PRINTER_STATUS_PAPER_JAM         "���&#1110;� �������; "
-    PD32_PRINTER_STATUS_PAPER_OUT         "�� �������&#1108; ������; "
-    PD32_PRINTER_STATUS_MANUAL_FEED       "�������� ���&#1110;� ������; "
-    PD32_PRINTER_STATUS_PAPER_PROBLEM     "�������� � �������; "
-    PD32_PRINTER_STATUS_OFFLINE           "������� � �����&#1110; offline; "
-    PD32_PRINTER_STATUS_IO_ACTIVE         "��&#1110;�/���&#1110;� ��������; "
-    PD32_PRINTER_STATUS_BUSY              "��������; "
-    PD32_PRINTER_STATUS_PRINTING          "��� ����; "
-    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "����� ������������ �������; "
-    PD32_PRINTER_STATUS_NOT_AVAILABLE     "�� ���������; "
-    PD32_PRINTER_STATUS_WAITING           "�������; "
-    PD32_PRINTER_STATUS_PROCESSING        "�������; "
-    PD32_PRINTER_STATUS_INITIALIZING      "���������; "
-    PD32_PRINTER_STATUS_WARMING_UP        "�����&#1110;�; "
-    PD32_PRINTER_STATUS_TONER_LOW         "����� ��� �&#1110;��&#1110;; "
-    PD32_PRINTER_STATUS_NO_TONER          "���� ������; "
+    PD32_VALUE_UREADABLE                  "���������� �������"
+    PD32_INVALID_PAGE_RANGE "�� �������� �� ������ � ��������� ��������\n\
+������� �������� ��� %d �� %d"
+    PD32_FROM_NOT_ABOVE_TO                "�������� ��� �� ������� ������������ ��:"
+    PD32_MARGINS_OVERLAP                  "���� ������������ �� ����������� \
+������� ������.\n������� �� ������"
+    PD32_NR_OF_COPIES_EMPTY               "�������� ����� ����� �� ���� ���� \
+������"
+    PD32_TOO_LARGE_COPIES                 "���� ������ ��������� ����� �� \
+���� ���� ����������� ����� ���������.\n������� �������� ��� 1 �� %d"
+    PD32_PRINT_ERROR                      "������� ������� ��������"
+    PD32_NO_DEFAULT_PRINTER               "����� ��������, ������������ �� ������������"
+    PD32_CANT_FIND_PRINTER                "�� ������� ������ �������"
+    PD32_OUT_OF_MEMORY                    "���� ���'���"
+    PD32_GENERIC_ERROR                    "�������(�) �������(�)"
+    PD32_DRIVER_UNKNOWN                   "��������� ������� ��������"
+
+    PD32_DEFAULT_PRINTER                  "������� �� ������������; "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "%d ���������� � �����"
+    PD32_PRINT_ALL_X_PAGES                "&��� %d ��������"
+    PD32_MARGINS_IN_INCHES                "����  [�����]"
+    PD32_MARGINS_IN_MILIMETERS            "���� [��]"
+    PD32_MILIMETERS                       "��"
+
+    PD32_PRINTER_STATUS_READY             "������"
+    PD32_PRINTER_STATUS_PAUSED            "�����������; "
+    PD32_PRINTER_STATUS_ERROR             "�������; "
+    PD32_PRINTER_STATUS_PENDING_DELETION  "������� ���������; "
+    PD32_PRINTER_STATUS_PAPER_JAM         "����� �������; "
+    PD32_PRINTER_STATUS_PAPER_OUT         "�� �������� ������; "
+    PD32_PRINTER_STATUS_MANUAL_FEED       "�������� ����� ������; "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM     "�������� � �������; "
+    PD32_PRINTER_STATUS_OFFLINE           "������� � ������ offline; "
+    PD32_PRINTER_STATUS_IO_ACTIVE         "����/����� ��������; "
+    PD32_PRINTER_STATUS_BUSY              "��������; "
+    PD32_PRINTER_STATUS_PRINTING          "��� ����; "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "����� ������������ �������; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "�� ���������; "
+    PD32_PRINTER_STATUS_WAITING           "�������; "
+    PD32_PRINTER_STATUS_PROCESSING        "�������; "
+    PD32_PRINTER_STATUS_INITIALIZING      "���������; "
+    PD32_PRINTER_STATUS_WARMING_UP        "�������; "
+    PD32_PRINTER_STATUS_TONER_LOW         "����� ��� �����; "
+    PD32_PRINTER_STATUS_NO_TONER          "���� ������; "
     PD32_PRINTER_STATUS_PAGE_PUNT         "Page punt; "
-    PD32_PRINTER_STATUS_USER_INTERVENTION "��������� ������������; "
-    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "���� ���'��&#1110;; "
-    PD32_PRINTER_STATUS_DOOR_OPEN         "������ �������� �&#1110;������; "
-    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "���&#1110;����� ������ ��������; "
-    PD32_PRINTER_STATUS_POWER_SAVE        "�������� � ���������� �����&#1110;; "
+    PD32_PRINTER_STATUS_USER_INTERVENTION "��������� ������������; "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "���� ���'���; "
+    PD32_PRINTER_STATUS_DOOR_OPEN         "������ �������� ��������; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "��������� ������ ��������; "
+    PD32_PRINTER_STATUS_POWER_SAVE        "�������� � ���������� ������; "
 }
 
 STRINGTABLE DISCARDABLE /* Color names */
 {
-    IDS_COLOR_BLACK     "������"
-    IDS_COLOR_MAROON    "���������"
-    IDS_COLOR_GREEN     "�������"
-    IDS_COLOR_OLIVE     "���������"
-    IDS_COLOR_NAVY      "���&#1110;�"
-    IDS_COLOR_PURPLE    "���������"
-    IDS_COLOR_TEAL      "������-���&#1110;�"
-    IDS_COLOR_GRAY      "�&#1110;���"
-    IDS_COLOR_SILVER    "��&#1110;����"
-    IDS_COLOR_RED       "��������"
-    IDS_COLOR_LIME      "���������"
-    IDS_COLOR_YELLOW    "������"
-    IDS_COLOR_BLUE      "�������"
-    IDS_COLOR_FUCHSIA   "�&#1110;��������"
-    IDS_COLOR_AQUA      "���������"
-    IDS_COLOR_WHITE     "�&#1110;���"
+    IDS_COLOR_BLACK     "������"
+    IDS_COLOR_MAROON    "���������"
+    IDS_COLOR_GREEN     "�������"
+    IDS_COLOR_OLIVE     "���������"
+    IDS_COLOR_NAVY      "�����"
+    IDS_COLOR_PURPLE    "���������"
+    IDS_COLOR_TEAL      "������-�����"
+    IDS_COLOR_GRAY      "�����"
+    IDS_COLOR_SILVER    "�������"
+    IDS_COLOR_RED       "��������"
+    IDS_COLOR_LIME      "���������"
+    IDS_COLOR_YELLOW    "������"
+    IDS_COLOR_BLUE      "�������"
+    IDS_COLOR_FUCHSIA   "����������"
+    IDS_COLOR_AQUA      "���������"
+    IDS_COLOR_WHITE     "�����"
 }

reactos/lib/comdlg32
filedlg.c 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- filedlg.c	8 May 2004 12:53:14 -0000	1.5
+++ filedlg.c	16 Jun 2004 06:54:39 -0000	1.6
@@ -32,8 +32,6 @@
  *
  * FIXME: old style hook messages are not implemented (except FILEOKSTRING)
  *
- * FIXME: lpstrCustomFilter not handled
- *
  * FIXME: algorithm for selecting the initial directory is too simple
  *
  * FIXME: add to recent docs
@@ -379,10 +377,10 @@
     LPCSTR s;
     int n, len;
 
-    /* filter is a list...  title\0ext\0......\0\0 */
+    /* customfilter contains a pair of strings...  title\0ext\0 */
     s = ofn->lpstrCustomFilter;
-    while (*s) s = s+strlen(s)+1;
-    s++;
+    if (*s) s = s+strlen(s)+1;
+    if (*s) s = s+strlen(s)+1;
     n = s - ofn->lpstrCustomFilter;
     len = MultiByteToWideChar( CP_ACP, 0, ofn->lpstrCustomFilter, n, NULL, 0 );
     customfilter = MemAlloc(len*sizeof(WCHAR));
@@ -438,8 +436,6 @@
  * Copy the OPENFILENAMEW structure in a FileOpenDlgInfos structure.
  * Call GetFileName95 with this structure and clean the memory.
  *
- * FIXME: lpstrCustomFilter has to be converted back
- *
  */
 BOOL  WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType)
 {
@@ -1983,6 +1979,22 @@
             }
 	  }
 
+          /* copy currently selected filter to lpstrCustomFilter */
+          if (fodInfos->ofnInfos->lpstrCustomFilter)
+          {
+            LPOPENFILENAMEA ofn = fodInfos->ofnInfos;
+            int len = WideCharToMultiByte(CP_ACP, 0, fodInfos->ShellInfos.lpstrCurrentFilter, -1,
+                                          NULL, 0, NULL, NULL);
+            if (len + strlen(ofn->lpstrCustomFilter) + 1 <= ofn->nMaxCustFilter)
+            {
+              LPSTR s = ofn->lpstrCustomFilter;
+              s += strlen(ofn->lpstrCustomFilter)+1;
+              WideCharToMultiByte(CP_ACP, 0, fodInfos->ShellInfos.lpstrCurrentFilter, -1,
+                                  s, len, NULL, NULL);
+            }
+          }
+
+
           if ( !FILEDLG95_SendFileOK(hwnd, fodInfos) )
 	      goto ret;
 
@@ -2148,13 +2160,34 @@
 static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
 {
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
+  int nFilters = 0;  /* number of filters */
+  int nFilterIndexCB;
 
   TRACE("\n");
 
+  if(fodInfos->customfilter)
+  {
+      /* customfilter has one entry...  title\0ext\0
+       * Set first entry of combo box item with customfilter
+       */
+      LPWSTR  lpstrExt;
+      LPCWSTR lpstrPos = fodInfos->customfilter;
+
+      /* Get the title */
+      lpstrPos += strlenW(fodInfos->customfilter) + 1;
+
+      /* Copy the extensions */
+      if (! *lpstrPos) return E_FAIL;	/* malformed filter */
+      if (!(lpstrExt = MemAlloc((strlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL;
+      strcpyW(lpstrExt,lpstrPos);
+
+      /* Add the item at the end of the combo */
+      CBAddStringW(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->customfilter);
+      CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters, lpstrExt);
+      nFilters++;
+  }
   if(fodInfos->filter)
   {
-    int nFilters = 0;	/* number of filters */
-    LPWSTR lpstrFilter;
     LPCWSTR lpstrPos = fodInfos->filter;
 
     for(;;)
@@ -2182,26 +2215,36 @@
       CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters, lpstrExt);
       nFilters++;
     }
-    /*
-     * Set the current filter to the one specified
-     * in the initialisation structure
-     * FIXME: lpstrCustomFilter not handled at all
-     */
+  }
+
+  /*
+   * Set the current filter to the one specified
+   * in the initialisation structure
+   */
+  if (fodInfos->filter || fodInfos->customfilter)
+  {
+    LPWSTR lpstrFilter;
+
+    /* Check to make sure our index isn't out of bounds. */
+    if ( fodInfos->ofnInfos->nFilterIndex >
+         nFilters - (fodInfos->customfilter == NULL ? 0 : 1) )
+      fodInfos->ofnInfos->nFilterIndex = (fodInfos->customfilter == NULL ? 1 : 0);
 
     /* set default filter index */
     if(fodInfos->ofnInfos->nFilterIndex == 0 && fodInfos->customfilter == NULL)
       fodInfos->ofnInfos->nFilterIndex = 1;
 
-    /* First, check to make sure our index isn't out of bounds. */
-    if ( fodInfos->ofnInfos->nFilterIndex > nFilters )
-      fodInfos->ofnInfos->nFilterIndex = nFilters;
+    /* calculate index of Combo Box item */
+    nFilterIndexCB = fodInfos->ofnInfos->nFilterIndex;
+    if (fodInfos->customfilter == NULL)
+      nFilterIndexCB--;
 
     /* Set the current index selection. */
-    CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->ofnInfos->nFilterIndex-1);
+    CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, nFilterIndexCB);
 
     /* Get the corresponding text string from the combo box. */
     lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
-                                             fodInfos->ofnInfos->nFilterIndex-1);
+                                             nFilterIndexCB);
 
     if ((INT)lpstrFilter == CB_ERR)  /* control is empty */
       lpstrFilter = NULL;
@@ -2214,7 +2257,9 @@
       fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) );
       strcpyW(fodInfos->ShellInfos.lpstrCurrentFilter,lpstrFilter);
     }
-  }
+  } else
+      fodInfos->ofnInfos->nFilterIndex = 0;
+
   return NOERROR;
 }
 
@@ -2237,8 +2282,9 @@
       /* Get the current item of the filetype combo box */
       int iItem = CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB);
 
-      /* set the current filter index - indexed from 1 */
-      fodInfos->ofnInfos->nFilterIndex = iItem + 1;
+      /* set the current filter index */
+      fodInfos->ofnInfos->nFilterIndex = iItem +
+        (fodInfos->customfilter == NULL ? 1 : 0);
 
       /* Set the current filter with the current selection */
       if(fodInfos->ShellInfos.lpstrCurrentFilter)

reactos/lib/comdlg32
filedlg16.c 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- filedlg16.c	8 May 2004 12:53:14 -0000	1.3
+++ filedlg16.c	16 Jun 2004 06:54:39 -0000	1.4
@@ -300,7 +300,7 @@
     HCURSOR             hCursorWait, oldCursor;
 
     TRACE("Trying to change to %s\n", debugstr_w(newPath));
-    if  ( !SetCurrentDirectoryW( newPath ))
+    if  ( newPath[0] && !SetCurrentDirectoryW( newPath ))
         return FALSE;
     lstrcpynW(buffer, newPath, sizeof(buffer)/sizeof(WCHAR));
 

reactos/lib/comdlg32
winehq2ros.patch 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- winehq2ros.patch	8 May 2004 12:53:14 -0000	1.3
+++ winehq2ros.patch	16 Jun 2004 06:54:39 -0000	1.4
@@ -4,7 +4,7 @@
 retrieving revision 1.39
 diff -u -r1.39 Makefile.in
 --- Makefile.in	12 Apr 2004 22:03:55 -0000	1.39
-+++ Makefile.in	8 May 2004 13:01:07 -0000
++++ Makefile.in	16 Jun 2004 07:02:56 -0000
 @@ -13,7 +13,6 @@
  	cdlg32.c \
  	colordlg.c \
@@ -24,11 +24,11 @@
 Index: filedlg.c
 ===================================================================
 RCS file: /home/wine/wine/dlls/commdlg/filedlg.c,v
-retrieving revision 1.79
-diff -u -r1.79 filedlg.c
---- filedlg.c	5 May 2004 23:49:39 -0000	1.79
-+++ filedlg.c	8 May 2004 13:01:08 -0000
-@@ -3241,6 +3241,7 @@
+retrieving revision 1.80
+diff -u -r1.80 filedlg.c
+--- filedlg.c	12 May 2004 00:12:04 -0000	1.80
++++ filedlg.c	16 Jun 2004 07:02:57 -0000
+@@ -3287,6 +3287,7 @@
  BOOL WINAPI GetOpenFileNameA(
  	LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
  {
@@ -36,7 +36,7 @@
      BOOL win16look = FALSE;
  
      if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
-@@ -3249,6 +3250,7 @@
+@@ -3295,6 +3296,7 @@
      if (win16look)
          return GetFileName31A(ofn, OPEN_DIALOG);
      else
@@ -44,7 +44,7 @@
          return GetFileDialog95A(ofn, OPEN_DIALOG);
  }
  
-@@ -3265,6 +3267,7 @@
+@@ -3311,6 +3313,7 @@
  BOOL WINAPI GetOpenFileNameW(
  	LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
  {
@@ -52,7 +52,7 @@
      BOOL win16look = FALSE;
  
      if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
-@@ -3273,6 +3276,7 @@
+@@ -3319,6 +3322,7 @@
      if (win16look)
          return GetFileName31W(ofn, OPEN_DIALOG);
      else
@@ -60,7 +60,7 @@
          return GetFileDialog95W(ofn, OPEN_DIALOG);
  }
  
-@@ -3290,6 +3294,7 @@
+@@ -3336,6 +3340,7 @@
  BOOL WINAPI GetSaveFileNameA(
  	LPOPENFILENAMEA ofn) /* [in/out] address of init structure */
  {
@@ -68,7 +68,7 @@
      BOOL win16look = FALSE;
  
      if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
-@@ -3298,6 +3303,7 @@
+@@ -3344,6 +3349,7 @@
      if (win16look)
          return GetFileName31A(ofn, SAVE_DIALOG);
      else
@@ -76,7 +76,7 @@
          return GetFileDialog95A(ofn, SAVE_DIALOG);
  }
  
-@@ -3314,6 +3320,7 @@
+@@ -3360,6 +3366,7 @@
  BOOL WINAPI GetSaveFileNameW(
  	LPOPENFILENAMEW ofn) /* [in/out] address of init structure */
  {
@@ -84,7 +84,7 @@
      BOOL win16look = FALSE;
  
      if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE))
-@@ -3322,5 +3329,6 @@
+@@ -3368,5 +3375,6 @@
      if (win16look)
          return GetFileName31W(ofn, SAVE_DIALOG);
      else
@@ -97,7 +97,7 @@
 retrieving revision 1.75
 diff -u -r1.75 printdlg.c
 --- printdlg.c	19 Apr 2004 20:12:15 -0000	1.75
-+++ printdlg.c	8 May 2004 13:01:09 -0000
++++ printdlg.c	16 Jun 2004 07:02:58 -0000
 @@ -341,7 +341,7 @@
  	        lpdm->dmCollate =
  		  (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
CVSspam 0.2.8