Sync to Wine-20050930:
Alexandre Julliard <julliard@winehq.org>
- We are no longer generating .spec.c files.
- We are no longer generating .dbg.c files.
Milko Krachounov <milko@3mhz.net>
- Bulgarian resources for mpr, msi, user, commdlg, oleaut32, shdocvw,
  shell32, comctl32, msrle32, mshtml, winspool, wineps, serialui,
  setupapi, wininet, regedit, uninstaller, notepad, winecfg and
  winhelp.
Kevin Koltzau <kevin@plop.org>
- Fix warnings in 64bit.
Mike McCormack <mike@codeweavers.com>
- Fix gcc 4.0 warnings.
Alexander N. Sørnes <alex@thehandofagony.com>
- Added Norwegian translations.
Marcus Meissner <meissner@suse.de>
- PrintDlg16: Copy back the Flags, nFromPage, nToPage and nCopies struct
  members after the print dialog finishes.
Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
- Bring Finnish resources up to date.
Modified: trunk/reactos/lib/comdlg32/cdlg32.c
Added: trunk/reactos/lib/comdlg32/cdlg_Bg.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_Fi.rc
Modified: trunk/reactos/lib/comdlg32/cdlg_No.rc
Modified: trunk/reactos/lib/comdlg32/colordlg.c
Modified: trunk/reactos/lib/comdlg32/filedlg.c
Modified: trunk/reactos/lib/comdlg32/fontdlg.c
Modified: trunk/reactos/lib/comdlg32/printdlg.c
Modified: trunk/reactos/lib/comdlg32/printdlg16.c
Modified: trunk/reactos/lib/comdlg32/rsrc.rc

Modified: trunk/reactos/lib/comdlg32/cdlg32.c
--- trunk/reactos/lib/comdlg32/cdlg32.c	2005-10-08 13:24:27 UTC (rev 18330)
+++ trunk/reactos/lib/comdlg32/cdlg32.c	2005-10-08 13:28:54 UTC (rev 18331)
@@ -158,7 +158,7 @@
         if (COMDLG32_TlsIndex == TLS_OUT_OF_INDEXES)
 	  COMDLG32_TlsIndex = TlsAlloc();
 	if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES)
-	  TlsSetValue(COMDLG32_TlsIndex, (void *)err);
+	  TlsSetValue(COMDLG32_TlsIndex, (LPVOID)(DWORD_PTR)err);
 	else
 	  FIXME("No Tls Space\n");
 }
@@ -176,7 +176,7 @@
 DWORD WINAPI CommDlgExtendedError(void)
 {
         if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES)
-	  return (DWORD)TlsGetValue(COMDLG32_TlsIndex);
+	  return (DWORD_PTR)TlsGetValue(COMDLG32_TlsIndex);
 	else
 	  return 0; /* we never set an error, so there isn't one */
 }

Copied: trunk/reactos/lib/comdlg32/cdlg_Bg.rc (from rev 18330, vendor/wine/dlls/commdlg/current/cdlg_Bg.rc)
Property changes on: trunk/reactos/lib/comdlg32/cdlg_Bg.rc ___________________________________________________________________ Name: svn:keywords   + Author Date Id Revision Name: svn:eol-style   + native
Modified: trunk/reactos/lib/comdlg32/cdlg_Fi.rc
--- trunk/reactos/lib/comdlg32/cdlg_Fi.rc	2005-10-08 13:24:27 UTC (rev 18330)
+++ trunk/reactos/lib/comdlg32/cdlg_Fi.rc	2005-10-08 13:28:54 UTC (rev 18331)
@@ -1,5 +1,6 @@
 /*
  * Copyright 1995 Jukka Iivonen
+ * Copyright 2005 Kimmo Myllyvirta
  *
  * 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, "MS Shell Dlg"
 {
  LTEXT "Tiedosto&nimi:", 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 "&Hakemistot:", -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 "&Luettele tiedostot tyypeittõin:", 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 "&Asemat:", 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 "Avaa", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Peruuta", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ohje", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Vain luku", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | 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 "Avaa", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Peruuta", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ohje", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Vain luku", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
@@ -50,19 +51,19 @@
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "Tiedosto&nimi:", 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 "&Hakemistot:", -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 "Tallenna tiedosto &muodossa:", 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 "&Asemat:", 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 "Tallenna", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Peruuta", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ohje", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Vain luku", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | 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 "Tallenna", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Peruuta", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ohje", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Vain luku", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
@@ -73,19 +74,19 @@
 {
  LTEXT "Kirjoitin:", 1088, 6, 6, 40, 9
  LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Tulostusalue", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Kaikki", 1056, 16, 45, 60, 12
- RADIOBUTTON "&Valinta", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Sivut", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Tulosta", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Peruuta", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Asetukset", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Tulostusalue", grp1, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Kaikki", rad1, 16, 45, 60, 12
+ RADIOBUTTON "&Valinta", rad2, 16, 60, 60, 12
+ RADIOBUTTON "&Sivut", rad3, 16, 75, 60, 12
+ DEFPUSHBUTTON "Tulosta", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Peruuta", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Asetukset", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
  LTEXT "&Mistõ:", 1090, 60, 80, 30, 9
  LTEXT "Mi&hin:", 1091, 120, 80, 30, 9
  LTEXT "&Tulostustarkkuus:", 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 "Tulosta t&iedostoon", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Tiivistetty", 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 "Tulosta t&iedostoon", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Tiivistetty", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
@@ -94,24 +95,24 @@
 CAPTION "Kirjoittimen asetukset"
 FONT 8, "MS Shell Dlg"
 {
- GROUPBOX "Kirjoitin", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "O&letuskirjoitin", 1056, 16, 20, 80, 12
+ GROUPBOX "Kirjoitin", grp1, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "O&letuskirjoitin", rad1, 16, 20, 80, 12
  LTEXT "[ei valittu]", 1088, 35, 35, 120, 9
- RADIOBUTTON "&Erityinen kirjoitin", 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
+ RADIOBUTTON "&Erityinen kirjoitin", 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 "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Peruuta", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Asetukset...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Suunta", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Pysty", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Vaaka", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Paperi", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ PUSHBUTTON "&Asetukset...", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Suunta", grp2, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Pysty", rad3, 50, 100, 40, 12
+ RADIOBUTTON "&Vaaka", rad4, 50, 115, 40, 12
+ ICON "LANDSCAP", stc10, 10, 95, 32, 32
+ ICON "PORTRAIT", stc11, 10, 95, 32, 32
+ GROUPBOX "Paperi", grp3, 120, 85, 180, 50, BS_GROUPBOX
  LTEXT "&Koko:", 1089, 130, 95, 30, 9
  LTEXT "Lõ&hde:", 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,24 +121,24 @@
 CAPTION "Fontit"
 FONT 8, "MS Shell Dlg"
 {
-    LTEXT           "&Fontti:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+    LTEXT           "&Fontti:",      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           "Fonttit&yyli:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+    LTEXT           "Fonttit&yyli:", stc2 ,108,3,44,9
+    COMBOBOX        cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Koko:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+    LTEXT           "&Koko:",        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
-    PUSHBUTTON      "Peruuta",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "&Sovella", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "&Ohje" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "Efektit",1072,6,72,84,34,WS_GROUP
-    CHECKBOX	    "Yli&viivattu", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "A&lleviivattu", 1041, 10,94,50,10, BS_AUTOCHECKBOX
-    LTEXT           "V&õri:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    PUSHBUTTON      "Peruuta",       IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "&Ota kõytt÷÷n", psh3,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "&Ohje" ,        pshHelp,218,57,40,14,WS_GROUP
+    GROUPBOX        "Efektit",       grp1,6,72,84,34,WS_GROUP
+    CHECKBOX	    "Yli&viivattu",  chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "A&lleviivattu", chx2, 10,94,50,10, BS_AUTOCHECKBOX
+    LTEXT           "V&õri:",        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        "Nõyte",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
@@ -152,9 +153,9 @@
 CAPTION "Võri"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Pe&rusvõrit:",   1088, 4,    4,  140, 10
+ LTEXT "Pe&rusvõrit:",      1088, 4,    4,  140, 10
  LTEXT "&Muokatut võrit:",  1089, 4,   106, 140, 10
- LTEXT "Võri|&Tasainen",  1090, 150, 151,  48, 10
+ LTEXT "Võri|&Tasainen",    1090, 150, 151,  48, 10
  LTEXT   "&Pun:", 726 /*1094*/,249,126,24,10
  EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Vihr:",727/*1095*/,249,140,24,10
@@ -172,11 +173,11 @@
  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",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "S&ulje", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "O&hje", 1038,100,166, 44, 14
- PUSHBUTTON "&Lisõõ võri",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "M&õõrittele võri >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "Ok",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "S&ulje", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "O&hje", pshHelp,100,166, 44, 14
+ PUSHBUTTON "&Lisõõ võri",              712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "M&õõrittele võri >>",      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,16 @@
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Etsittõvõ:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Koko sana", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Kirjaink&oko", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Suunta", 1072, 107, 26, 68, 28
- CONTROL "&Yl÷s", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Alas", 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 "&Koko sana", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Kirjaink&oko", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Suunta", grp1, 107, 26, 68, 28
+ CONTROL "&Yl÷s", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 30, 12
+ CONTROL "&Alas", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 148, 38, 30, 12
+
  DEFPUSHBUTTON "Etsi &seuraava", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Peruuta", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "O&hje", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Peruuta", IDCANCEL,       182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "O&hje", pshHelp,          182, 45, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
 
@@ -205,14 +207,260 @@
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Etsittõvõ:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT "Ko&rvattava:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Koko sana", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Kirjaink&oko", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Koko sana", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Kirjaink&oko", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
  DEFPUSHBUTTON "Etsi &seuraava", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Korv&aa", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Korvaa ka&ikki", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "S&ulje", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "O&hje", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Korv&aa", psh1          , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Korvaa ka&ikki", psh2   , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "S&ulje", IDCANCEL       , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "O&hje", 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 "Tulosta"
+FONT 8, "MS Shell Dlg"
+{
+    DEFPUSHBUTTON   "OK",                  IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Peruuta",             IDCANCEL, 232,164, 48,14, WS_GROUP
+    PUSHBUTTON      "Oh&je",               pshHelp,  50, 161, 48,14, WS_GROUP
+
+    GROUPBOX        "Tulostin",            grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "&Tulosta tiedostoon", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,207,70,70,12
+    PUSHBUTTON      "&Ominaisuudet",       psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Nimi:",              stc6,  16, 20,  36,8
+    COMBOBOX                               cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Tila:",               stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",         stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Tyyppi:",             stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",          stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Sijainti:",           stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location",      stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Kommentti:",          stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",        stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Kopioita",            grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "Kopioiden &mõõrõ:",   stc5,168,108,68,8
+    ICON            "",                    ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "&Kokoa",              chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+    EDITTEXT                               edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+
+    GROUPBOX        "Tulosta alueelta",    grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "K&aikki",             rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "&Sivut",              rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "&Valinta",            rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+    EDITTEXT                               edt1,  70,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT                               edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
+    RTEXT           "M&istõ:",             stc2,  48,124,  20,8
+    RTEXT           "Mi&hin:",             stc3,  98,124,  20,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 "Tulostuksen Asetukset"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
+    PUSHBUTTON      "Peruuta",IDCANCEL,232,156,48,14
+/*    PUSHBUTTON      "Verkko...", psh5, 284,156,48,14 */
+
+    GROUPBOX        "Tulostin",       grp4,   8,  4, 272,84, WS_GROUP
+    PUSHBUTTON      "&Ominaisuudet",  psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Nimi:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Tila:",          stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Tyyppi:",        stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Sijainti:",      stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Kommentti:",     stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Paperi",         grp2,   8, 92, 164,56, WS_GROUP
+    LTEXT           "&Koko:",         stc2,  16,108,  36, 8
+    COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "&Lõhde:",        stc3,  16,128,  36, 8
+    COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+
+    GROUPBOX        "Suunta",         grp1, 180, 92, 100,56, WS_GROUP
+    ICON            "",               ico1, 195,112,  18,20, WS_GROUP
+    CONTROL         "&Pysty",         rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "V&aaka",         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 "Sivun Asetukset"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  CONTROL         "",             rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+  CONTROL         "",             rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+  CONTROL         "",             rct3, "Static", SS_GRAYRECT,  84, 88, 80, 4
+  GROUPBOX        "Paperi",       grp2, 8, 96, 224, 56, BS_GROUPBOX
+  LTEXT           "&Koko:",       stc2, 16, 112, 36, 8
+  COMBOBOX                        cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  LTEXT           "&Sy÷tt÷:",     stc3, 16, 132, 36, 8
+  COMBOBOX                        cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  GROUPBOX        "Asento",       grp1, 8, 156, 64, 56, BS_GROUPBOX
+  AUTORADIOBUTTON "P&ysty",        rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "V&aaka",     rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+  GROUPBOX        "Reunat",       grp4, 80, 156, 152, 56, BS_GROUPBOX
+  LTEXT           "&Vasen:",      stc15, 88, 172, 21, 8
+  EDITTEXT                        edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+  LTEXT           "&Oikea:",      stc16, 159, 172, 27, 8
+  EDITTEXT                        edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+  LTEXT           "&Vasen:",      stc17, 88, 192, 21, 8
+  EDITTEXT                        edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+  LTEXT           "&Pohja:",      stc18, 159, 192, 23, 8
+  EDITTEXT                        edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+  DEFPUSHBUTTON   "OK",           IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
+  PUSHBUTTON      "Peruuta",      IDCANCEL, 126, 220, 50, 14
+  PUSHBUTTON      "T&ulostin...", 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 "Avaa"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT	"&Kansiosta:",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	"&Nimi:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+    EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
+
+    LTEXT	"&Tyyppi:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+    COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+    CONTROL	"Avaa vain &lukuoikeuksilla",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+
+    DEFPUSHBUTTON	"&Avaa",		 IDOK,222,110,50,14
+    PUSHBUTTON		"Peruuta",		 IDCANCEL,222,128,50,14
+    PUSHBUTTON		"&Ohje",		 pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_ABOUTBOX            "&Tietoja FolderPicker Test:stõ"
+    IDS_DOCUMENTFOLDERS     "Dokumenttikansiot"
+    IDS_PERSONAL            "Omat Dokumentit"
+    IDS_FAVORITES           "Suosikit"
+    IDS_PATH                "Jõrjestelmõkansio"
+    IDS_DESKTOP             "Ty÷p÷ytõ"
+    IDS_FONTS               "Fontit"
+    IDS_MYCOMPUTER          "Oma Tietokone"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_SYSTEMFOLDERS       "Jõrjestemõkansiot"
+    IDS_LOCALHARDRIVES      "Paikalliset kiintolevyt"
+    IDS_FILENOTFOUND        "Tiedostoa ei l÷ydy"
+    IDS_VERIFYFILE          "Varmista, ettõ tiedoston nimi on oikein"
+    IDS_CREATEFILE          "Tiedostoa ei ole olemassa\nHaluatko luoda tiedoston"
+    IDS_OVERWRITEFILE       "Tiedosto on jo olemassa.\nHaluatko ylikirjoitaa sen?"
+    IDS_INVALID_FILENAME_TITLE "Kansio sisõltõõ epõkelpoja merkkejõ"
+    IDS_INVALID_FILENAME    "Tiedoston nimi ei voi sisõltõõ nõitõ merkkejõ: \n                          / : < > |"
+    IDS_PATHNOTEXISTING     "Kansiota ei ole"
+    IDS_FILENOTEXISTING     "Tiedostoa ei ole"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_UPFOLDER         "Kansio Yl÷spõin"
+    IDS_NEWFOLDER        "Luo Uusi Kansio"
+    IDS_LISTVIEW         "Lista"
+    IDS_REPORTVIEW       "Tiedot"
+    IDS_TODESKTOP        "Selaa Ty÷p÷ytõõ"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    PD32_PRINT_TITLE       "Tulosta"
+
+    PD32_VALUE_UREADABLE                  "Lukukelvoton merkintõ"
+    PD32_INVALID_PAGE_RANGE               "Arvo ei ole paperien mõõrõn alueella.\nAnna arvo võliltõ %d ja %d."
+    PD32_FROM_NOT_ABOVE_TO                "Alukuarvo ei voi olla suurempi kuin loppuarvo."
+    PD32_MARGINS_OVERLAP                  "Marginaalit ovat põõllekõin tai ulkona paperin alueelta.\nMõõritõ marginaalit uudestaan."
+    PD32_NR_OF_COPIES_EMPTY               "Kopioiden mõõrõ tõytyy antaa."
+    PD32_TOO_LARGE_COPIES                 "Tulostin ei tue nõin montaa kopiota. \nValitse arvo võliltõ 1 ja %d."
+    PD32_PRINT_ERROR                      "Tulostinvirhe."
+    PD32_NO_DEFAULT_PRINTER               "Oletustulostinta ei ole mõõritetty."
+    PD32_CANT_FIND_PRINTER                "Tulostinta ei l÷ydy."
+    PD32_OUT_OF_MEMORY                    "Muisti loppu."
+    PD32_GENERIC_ERROR                    "Virhe."
+    PD32_DRIVER_UNKNOWN                   "Tuntematon tulostinajuri."
+
+    PD32_DEFAULT_PRINTER                  "Oletustulostin; "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "Jonossa on %d dokumenttia"
+    PD32_MARGINS_IN_INCHES                "Marginaalit [inches]"
+    PD32_MARGINS_IN_MILIMETERS            "Marginaalit [mm]"
+    PD32_MILIMETERS                       "mm"
+
+    PD32_PRINTER_STATUS_READY             "Valmis"
+    PD32_PRINTER_STATUS_PAUSED            "Pysõytetty; "
+    PD32_PRINTER_STATUS_ERROR             "Virhe; "
+    PD32_PRINTER_STATUS_PENDING_DELETION  "Tuhoutumassa; "
+    PD32_PRINTER_STATUS_PAPER_JAM         "Paperitukos; "
+    PD32_PRINTER_STATUS_PAPER_OUT         "Paperi loppu; "
+    PD32_PRINTER_STATUS_MANUAL_FEED       "Sy÷tõ paperi kõsin; "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Ongelma paperin kanssa; "
+    PD32_PRINTER_STATUS_OFFLINE           "Ei yhteyttõ tulostimeen; "
+    PD32_PRINTER_STATUS_IO_ACTIVE         "I/O Toiminnassa; "
+    PD32_PRINTER_STATUS_BUSY              "Varattu; "
+    PD32_PRINTER_STATUS_PRINTING          "Tulostaa; "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "Output tray is full; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Ei saatavilla; "
+    PD32_PRINTER_STATUS_WAITING           "Odottaa; "
+    PD32_PRINTER_STATUS_PROCESSING        "Kõsitellõõn; "
+    PD32_PRINTER_STATUS_INITIALIZING      "Alustetaan; "
+    PD32_PRINTER_STATUS_WARMING_UP        "Lõmmitetõõn; "
+    PD32_PRINTER_STATUS_TONER_LOW         "Võriaine võhissõ; "
+    PD32_PRINTER_STATUS_NO_TONER          "Ei võriõainetta; "
+    PD32_PRINTER_STATUS_PAGE_PUNT         "Page punt; "
+    PD32_PRINTER_STATUS_USER_INTERVENTION "Kõyttõjõn keskeyttõmõ; "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Muisti loppu; "
+    PD32_PRINTER_STATUS_DOOR_OPEN         "Tulostimen kansi on auki; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Tulostinpalvelin tuntematon; "
+    PD32_PRINTER_STATUS_POWER_SAVE        "Virransõõst÷tila; "
+}
+
+STRINGTABLE DISCARDABLE /* Color names */
+{
+    IDS_COLOR_BLACK     "Musta"
+    IDS_COLOR_MAROON    "Kastanjanruskea"
+    IDS_COLOR_GREEN     "Vihreõ"
+    IDS_COLOR_OLIVE     "Oliivinvihreõ"
+    IDS_COLOR_NAVY      "Laivastonsininen"
+    IDS_COLOR_PURPLE    "Purppura"
+    IDS_COLOR_TEAL      "Turkoosi"
+    IDS_COLOR_GRAY      "Harmaa"
+    IDS_COLOR_SILVER    "Hopea"
+    IDS_COLOR_RED       "Punainen"
+    IDS_COLOR_LIME      "Vaaleanvihreõ"
+    IDS_COLOR_YELLOW    "Keltainen"
+    IDS_COLOR_BLUE      "Sininen"
+    IDS_COLOR_FUCHSIA   "Tummanpunainen"
+    IDS_COLOR_AQUA      "Vaaleanturkoosi"
+    IDS_COLOR_WHITE     "Valkoinen"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_FONT_SIZE   "Valitse fontin koko võliltõ %d ja %d pistettõ."
+    IDS_SAVE_BUTTON "&Tallenna"
+    IDS_SAVE_IN     "&Kansioon:"
+    IDS_SAVE        "Tallenna"
+    IDS_SAVE_AS     "Tallenna nimellõ"
+    IDS_OPEN_FILE   "Avaa Tiedosto"
+}

Modified: trunk/reactos/lib/comdlg32/cdlg_No.rc
--- trunk/reactos/lib/comdlg32/cdlg_No.rc	2005-10-08 13:24:27 UTC (rev 18330)
+++ trunk/reactos/lib/comdlg32/cdlg_No.rc	2005-10-08 13:28:54 UTC (rev 18331)
@@ -1,5 +1,5 @@
 /*
- * Copyright 1994 Dag Asheim
+ * Copyright 2005 Alexander N. S°rnes
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,131 +20,164 @@
  * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
  */
 
-LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "?pne"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LTEXT "Fil&navn:", 1090, 6, 6, 76, 9
+ 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 "&Kataloger:", -1, 110, 6, 92, 9
+ LTEXT "&Kateloger:", -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 "Liste over filer av &type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Kataloger:", 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 "?pne", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjelp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ LTEXT "Vis filer av &typen:", 1089, 6, 104, 90, 9
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Stasjoner:", 1091, 110, 104, 92, 9
+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "?pne", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjelp", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Sk&rivebeskyttet", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Lagre som ..."
+CAPTION "Lagre som . . ."
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LTEXT "Fil&navn:", 1090, 6, 6, 76, 9
+ 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 "&Kataloger:", -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 "Liste over filer av &type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Kataloger:", 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 "Lagre som", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjelp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ LTEXT "Vis filer av &typen:", 1089, 6, 104, 90, 9
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Stasjoner:", 1091, 110, 104, 92, 9
+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Lagre som", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjelp", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Sk&rivebeskyttet", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
 PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv"
+CAPTION "Skriv ut"
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "Skriver:", 1088, 6, 6, 40, 9
  LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Skriv del", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Alle", 1056, 16, 45, 60, 12
- RADIOBUTTON "&Markert", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Sider", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Skriv", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Oppsett", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "UtskriftsomrÕde", grp1, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Alt", rad1, 16, 45, 60, 12
+ RADIOBUTTON "M&erket omrÕde", rad2, 16, 60, 60, 12
+ RADIOBUTTON "&Sider", rad3, 16, 75, 60, 12
+ DEFPUSHBUTTON "Skriv ut", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Opp&sett", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
  LTEXT "&Fra:", 1090, 60, 80, 30, 9
  LTEXT "&Til:", 1091, 120, 80, 30, 9
  LTEXT "&Utskriftskvalitet:", 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 "&Skriv til fil", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Sammentrykket", 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 "Skriv til fi&l", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Kondensert", chx2, 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 "Skriveoppsett"
+CAPTION "Utskriftsinnstillinger"
 FONT 8, "MS Shell Dlg"
 {
- GROUPBOX "Skriver", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Standardskriver", 1056, 16, 20, 80, 12
- LTEXT "[ingen]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Spesifikk &skriver", 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
+ GROUPBOX "Skriver", grp1, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "Stan&dardskriver", rad1, 16, 20, 80, 12
+ LTEXT "(Ingen)", 1088, 35, 35, 120, 9
+ RADIOBUTTON "S&pesifik skriver", 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 "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Oppsett", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientering", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Portrett", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Landskap", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papir", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&St°rrelse", 1089, 130, 95, 30, 9
+ PUSHBUTTON "Opp&sett", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientering", grp2, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&StÕende", rad3, 50, 100, 40, 12
+ RADIOBUTTON "&Liggende", rad4, 50, 115, 40, 12
+ ICON "LANDSCAP", stc10, 10, 95, 32, 32
+ ICON "PORTRAIT", stc11, 10, 95, 32, 32
+ GROUPBOX "Papir", grp3, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "St°rr&else", 1089, 130, 95, 30, 9
  LTEXT "&Kilde", 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
 }
 
 
-CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Font"
+CAPTION "Skrift"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Font:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+    LTEXT           "&Skrift:",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           "Skriftst&il:",stc2 ,108,3,44,9
+    COMBOBOX        cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&St°rrelse:",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      "Avbryt",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Bruk", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Hjelp" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
+    GROUPBOX        "Effekter",grp1,6,72,84,34,WS_GROUP
+    CHECKBOX	    "Gjennomstre&ket", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "&Understreket", chx2, 10,94,50,10, BS_AUTOCHECKBOX
+    LTEXT           "&Farge:", 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        "ForhÕndsvisning",grp2,98,72,120,36,WS_GROUP
+    CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+    LTEXT           "Skr&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, 264, 185
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Farge"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "&Grunnleggende farger:", 1088, 6, 6, 40, 9
- LTEXT "&Egendefinerte farger:", 1089, 6, 126, 40, 9
- LTEXT "&Ensfarget", 1090, 100, 146, 40, 9
- LTEXT "&Int:", 1091, 150, 126, 40, 9
- LTEXT "&Met:", 1092, 150, 146, 40, 9
- LTEXT "&Lum:", 1093, 150, 166, 40, 9
- LTEXT "&R°d:", 1094, 150, 126, 40, 9
- LTEXT "&Gr°nn:", 1095, 150, 146, 40, 9
- LTEXT "&BlÕ:", 1096, 150, 166, 40, 9
- DEFPUSHBUTTON "Ok", IDOK, 6, 182, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Legg til egendefinert farge", 1024, 120, 182, 100, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Fjern egendefinerte farger", 1025, 6, 164, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 76, 182, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Basisfarger:",   1088, 4,    4,  140, 10
+ LTEXT "&Egendefinerte farger:",  1089, 4,   106, 140, 10
+ LTEXT "Farge |  Sol&id",  1090, 150, 151,  48, 10
+ LTEXT   "&R°d:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Gr°nn:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&BlÕ:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Nyanse:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Metning:" ,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 "Avbryt", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Hjelp", pshHelp,100,166, 44, 14
+ PUSHBUTTON "Legg til i egendefinerte f&arger",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Definer egendefinerte farger >>", 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"  */
 }
 
 
@@ -153,33 +186,282 @@
 CAPTION "Finn"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "&Finn hva:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Kun hele ord", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skill pÕ store/smÕ bokstaver", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Retning", 1072, 107, 26, 68, 28
- CONTROL "&Opp", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Ned", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "&Finn neste", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjelp", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "Fi&nn:", -1, 4, 8, 42, 8
+ EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Finn &kun hele ord", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Skill &mellom store/smÕ bokstaver", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Retning", grp1, 107, 26, 68, 28
+ CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Ned", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
+ DEFPUSHBUTTON "&Finn neste", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Avbryt", IDCANCEL	 , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjelp", pshHelp	 , 182, 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 "Bytt"
+CAPTION "Erstatt"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "&Finn hva:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "&Bytt med:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Kun hele ord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skill pÕ store/smÕ bokstaver", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- DEFPUSHBUTTON "&Finn neste", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Bytt", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Bytt alt", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjelp", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "Fi&nn:", -1, 4, 9, 48, 8
+ EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Erstatt med:", -1, 4, 26, 48, 8
+ EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Finn kun &hele ord", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Skill mellom store og smÕ bokstaver", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
+ DEFPUSHBUTTON "&Finn neste", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "E&rsatt", psh1	 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Erstatt &alle", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL	 , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjelp", 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 "Skriv ut"
+FONT 8, "MS Shell Dlg"
+{
+    DEFPUSHBUTTON   "OK",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Avbryt", IDCANCEL, 232,164, 48,14, WS_GROUP
+    PUSHBUTTON      "&Hjelp",  pshHelp,  50, 161, 48,14, WS_GROUP
+
+    GROUPBOX        "Skriver",        grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "Skriv ti&l fil", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+    PUSHBUTTON      "&Egenskaper",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Navn:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Status:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Tullestatus",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Tulletype",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Hvor:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Tulleplassering", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Kommentar:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Tullekommentar",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Kopier",         grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "Antall &kopier:",stc5,168,108,68,8
+    ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "S&orter",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+    EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+
+    GROUPBOX        "UtskriftsomrÕde",    grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "&Alt",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "&Sider",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "&Merket omrÕde",     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           "&Fra:",         stc2,  52,124,  20,8
+    RTEXT           "&Til:",           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 "Utskriftoppsett"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
+    PUSHBUTTON      "Avbryt",IDCANCEL,232,156,48,14
+/*    PUSHBUTTON      "Nettverk . . .", psh5, 284,156,48,14 */
+
+    GROUPBOX        "Skriver",        grp4,   8,  4, 272,84, WS_GROUP
+    PUSHBUTTON      "&Egenskaper",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Navn:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Status:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Tullestatus",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Tulletype",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Plassering:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Tulleplassering", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Kommentar:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Tullekommentar",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Papir",          grp2,   8, 92, 164,56, WS_GROUP
+    LTEXT           "&St°rrelse:",         stc2,  16,108,  36, 8
+    COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "&Kilde:",       stc3,  16,128,  36, 8
+    COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+
+    GROUPBOX        "Orientering",    grp1, 180, 92, 100,56, WS_GROUP
+    ICON            "",               ico1, 195,112,  18,20, WS_GROUP
+    CONTROL         "S&tÕende",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "&Liggende",     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 "Sideoppsett"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+  CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+  CONTROL "", rct3, "Static", SS_GRAYRECT,  84, 88, 80, 4
+  GROUPBOX "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX
+  LTEXT "&St°rrelse:", stc2, 16, 112, 36, 8
+  COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  LTEXT "Sku&ff:", stc3, 16, 132, 36, 8
+  COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  GROUPBOX "Orientering", grp1, 8, 156, 64, 56, BS_GROUPBOX
+  AUTORADIOBUTTON "S&tÕende", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "&Liggende", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+  GROUPBOX "Rammer", grp4, 80, 156, 152, 56, BS_GROUPBOX
+  LTEXT "V&enstre:", stc15, 88, 172, 21, 8
+  EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+  LTEXT "H°y&re:", stc16, 159, 172, 27, 8
+  EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+  LTEXT "T&opp:", stc17, 88, 192, 21, 8
+  EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+  LTEXT "&Bunn:", stc18, 159, 192, 23, 8
+  EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+  DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
+  PUSHBUTTON "Avbryt", IDCANCEL, 126, 220, 50, 14
+  PUSHBUTTON "Sk&river . . .", 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 "?pne"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT	"Se &i:",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	"Fil&navn:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+    EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
+
+    LTEXT	"Fil&type:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+    COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+    CONTROL	"?pne som sk&rivebeskyttet",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+
+    DEFPUSHBUTTON	"&?pne",		 IDOK,222,110,50,14
+    PUSHBUTTON		"Avbryt",		 IDCANCEL,222,128,50,14
+    PUSHBUTTON		"&Hjelp",		 pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_ABOUTBOX            "Om k&atalogvelger-test"
+    IDS_DOCUMENTFOLDERS     "Dokumentmapper"
+    IDS_PERSONAL            "Mine dokumenter"
+    IDS_FAVORITES           "Mine favoritter"
+    IDS_PATH                "Systemsti"
+    IDS_DESKTOP             "Skrivebord"
+    IDS_FONTS               "Skrifter"
+    IDS_MYCOMPUTER          "Min datamaskin"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_SYSTEMFOLDERS       "Systemkataloger"
+    IDS_LOCALHARDRIVES      "Lokale harddisker"
+    IDS_FILENOTFOUND        "Fant ikke filen"
+    IDS_VERIFYFILE          "Kontroller at filnavnet som ble oppgitt er korrekt"
+    IDS_CREATEFILE          "Filen finnes ikke.\nSkal den opprettes?"
+    IDS_OVERWRITEFILE       "Filen finnes fra f°r.\nSkal den overskrives?"
+    IDS_INVALID_FILENAME_TITLE "Ugyldige tegn i filnavnet"
+    IDS_INVALID_FILENAME    "Et filnavn kan ikke inneholder f°lgende tegn:\n                          / : < > |"
+    IDS_PATHNOTEXISTING     "Stien finnes ikke"
+    IDS_FILENOTEXISTING     "Filen finnes ikke"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_UPFOLDER         "Opp ett nivÕ"
+    IDS_NEWFOLDER        "Lag ny katalog"
+    IDS_LISTVIEW         "Liste"
+    IDS_REPORTVIEW       "Detaljer"
+    IDS_TODESKTOP        "Bla til skrivebordet"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    PD32_PRINT_TITLE       "Skriv ut"
+
+    PD32_VALUE_UREADABLE                  "Uleselig oppf°ring"
[truncated at 1000 lines; 197 more skipped]