Sync to Wine-0_9_3:
authorGé van Geldorp <ge@gse.nl>
Mon, 12 Dec 2005 22:44:46 +0000 (22:44 +0000)
committerGé van Geldorp <ge@gse.nl>
Mon, 12 Dec 2005 22:44:46 +0000 (22:44 +0000)
Michael Jung <mjung@iss.tu-darmstadt.de>
- Initialize OLE instead of COM only in order to enable Drag and Drop.
Robert Shearman <rob@codeweavers.com>
- comdlg32: Don't worry if an HGLOBAL passed to printdlg is already locked.
YunSong Hwang <hys545@dreamwiz.com>
- Update Korean translations.
Milko Krachounov <milko@3mhz.net>
- Update the Bulgarian resources for commdlg and regedit.
Pavel Roskin <proski@gnu.org>
- Improve script selection combobox in the font selection dialog - set
  height to 90 (the old value of 10 could only fit a single line) and
  remove CBS_OWNERDRAWFIXED flag to trim excessive height from the list
  items.
Alexander N. Sørnes <alex@thehandofagony.com>
- Update Norwegian Bokmaal resources.

svn path=/trunk/; revision=20129

25 files changed:
reactos/lib/comdlg32/cdlg_Bg.rc
reactos/lib/comdlg32/cdlg_Ca.rc
reactos/lib/comdlg32/cdlg_Cn.rc
reactos/lib/comdlg32/cdlg_Cs.rc
reactos/lib/comdlg32/cdlg_Da.rc
reactos/lib/comdlg32/cdlg_De.rc
reactos/lib/comdlg32/cdlg_En.rc
reactos/lib/comdlg32/cdlg_Es.rc
reactos/lib/comdlg32/cdlg_Fi.rc
reactos/lib/comdlg32/cdlg_Fr.rc
reactos/lib/comdlg32/cdlg_Hu.rc
reactos/lib/comdlg32/cdlg_It.rc
reactos/lib/comdlg32/cdlg_Ja.rc
reactos/lib/comdlg32/cdlg_Nl.rc
reactos/lib/comdlg32/cdlg_No.rc
reactos/lib/comdlg32/cdlg_Pl.rc
reactos/lib/comdlg32/cdlg_Pt.rc
reactos/lib/comdlg32/cdlg_Ru.rc
reactos/lib/comdlg32/cdlg_Si.rc
reactos/lib/comdlg32/cdlg_Sk.rc
reactos/lib/comdlg32/cdlg_Sv.rc
reactos/lib/comdlg32/cdlg_Uk.rc
reactos/lib/comdlg32/cdlg_Wa.rc
reactos/lib/comdlg32/cdlg_Zh.rc
reactos/lib/comdlg32/printdlg.c

index 5e0c130..33a756a 100644 (file)
@@ -143,7 +143,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Ïðèìåð",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "&Àçáóêà:",stc7 ,98,114,40,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
@@ -406,9 +406,9 @@ STRINGTABLE DISCARDABLE
     PD32_OUT_OF_MEMORY                    "Íåäîñòèã íà ïàìåò."
     PD32_GENERIC_ERROR                    "Ïîÿâè ñå ãðåøêà."
     PD32_DRIVER_UNKNOWN                   "Íåïîçíàò äðàéâåð çà ïðèíòåðà."
-    PD32_NO_DEVICES                       "Before you can perform printer-related tasks \
-such as page setup or printing a document, you need to install a printer. \
-Please install one and retry."
+    PD32_NO_DEVICES                       "Ïðåäè äà ìîæåòå äà èçâúðøâàòå îïàðåöèè, \
+ñâúðçàíè ñ ïå÷àò êàòî íàñòðîéêà íà ñòðàíèöàòà èëè ðàçïå÷àòâàíå íà äîêóìåíò, \
+ñàìî àêî èìàòå èíñòàëèðàí ïðèíòåð. Èíñòàëèðàéòå ïðèíòåð è îïèòàéòå îòíîâî."
 
     PD32_DEFAULT_PRINTER                  "Ïðèíòåð ïî ïîäðàçáèðàíå; "
     PD32_NR_OF_DOCUMENTS_IN_QUEUE         "Èìà %d äîêóìåíòà â îïàøêàòà"
index 73f91ae..b399ca4 100644 (file)
@@ -142,7 +142,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Exemple",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index baaa9fb..bf60c52 100644 (file)
@@ -142,7 +142,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "ʾÀý",grp2,98,72,120,36,WS_GROUP
     CTEXT           "ÖÐÎÄ×ÖÌåAaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index a3f0302..c3c2184 100644 (file)
@@ -143,7 +143,7 @@ FONT 8, "MS Shell Dlg"
  GROUPBOX        "Ukázka",grp2,98,72,120,36,WS_GROUP
  CTEXT           "Pøíli¹ ¾lu»ouèký kùò úpìl ïábelské ódy",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 |
+ COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                  CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 4cac09c..f684deb 100644 (file)
@@ -142,7 +142,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Eksempel",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 5cdedb2..d3c6d25 100644 (file)
@@ -173,7 +173,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Muster",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 7326702..1cf90b2 100644 (file)
@@ -142,7 +142,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Sample",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt:",stc7 ,98,114,40,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
@@ -507,7 +507,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Sample",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt:",stc7 ,98,114,40,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 84c1b73..ff2e623 100644 (file)
@@ -143,7 +143,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Ejemplo",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZzÑñ",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Codificación:",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 5690310..f81590d 100644 (file)
@@ -143,7 +143,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Näyte",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 63f2b6d..66c721d 100644 (file)
@@ -146,7 +146,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Exemple",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 40ebf20..58cf236 100644 (file)
@@ -141,7 +141,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Minta",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaÁáÕõÛû",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Í&ásrendszer:",stc7 ,98,114,40,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
@@ -462,96 +462,3 @@ STRINGTABLE DISCARDABLE
     IDS_SAVE_AS     "Menté&s másként"
     IDS_OPEN_FILE   "Megnyitás"
 }
-
-
-/****************************************************************/
-/* Hungarian neutral resources
-/****************************************************************/
-
-LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Betûtípus"
-FONT 8, "MS Shell Dlg"
-{
-    LTEXT           "&Betûtípus:",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           "Betû &stílus:",stc2 ,108,3,44,9
-    COMBOBOX        cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Méret:",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      "Mégse",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Alkalmaz", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Súgó" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Hatások",grp1,6,72,84,34,WS_GROUP
-    CHECKBOX       "Át&húzás", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX       "A&láhúzûs", chx2, 10,94,50,10, BS_AUTOCHECKBOX
-    LTEXT           "S&zín:", 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        "Minta",grp2,98,72,120,36,WS_GROUP
-    CTEXT           "AaÁáÕõÛû",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
-    LTEXT           "Í&rásrendszer:",stc7 ,98,114,40,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-                   CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Színbeállítás"
-FONT 8, "MS Shell Dlg"
-{
- LTEXT "&Alapszínek:",   1088, 4,    4,  140, 10
- LTEXT "&Egyéni színek:",  1089, 4,   106, 140, 10
- LTEXT "Szín |  Egyszínû",  1090, 150, 151,  48, 10
- LTEXT   "&Vörös:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Zöld:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Kék:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Árnyalat:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Telítettség:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Fényesség:" ,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 "Mégse", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Súgó", pshHelp,100,166, 44, 14
- PUSHBUTTON "&Hozzáadás az egyéni színekhez",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Egyéni színek s&zerkesztése >>", 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"  */
-}
-
-STRINGTABLE DISCARDABLE /* Color names */
-{
-    IDS_COLOR_BLACK     "Fekete"
-    IDS_COLOR_MAROON    "Barna"
-    IDS_COLOR_GREEN     "Zöld"
-    IDS_COLOR_OLIVE     "Oliva"
-    IDS_COLOR_NAVY      "Sötétkék"
-    IDS_COLOR_PURPLE    "Sötétlila"
-    IDS_COLOR_TEAL      "Sötétcián"
-    IDS_COLOR_GRAY      "Sötétzürke"
-    IDS_COLOR_SILVER    "Világosszürke"
-    IDS_COLOR_RED       "Vörös"
-    IDS_COLOR_LIME      "Neonzöld"
-    IDS_COLOR_YELLOW    "Sárga"
-    IDS_COLOR_BLUE      "Kék"
-    IDS_COLOR_FUCHSIA   "Ciklámen"
-    IDS_COLOR_AQUA      "Türkizkék"
-    IDS_COLOR_WHITE     "Fehér"
-}
-
index eb6ecef..6606739 100644 (file)
@@ -143,7 +143,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Esempio",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 262883b..05b4bbc 100644 (file)
@@ -142,7 +142,7 @@ FONT 9, "MS UI Gothic"
     GROUPBOX        "\83T\83\93\83v\83\8b",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "\95\8e\9a\83Z\83b\83g(&I):",stc7 ,98,114,40,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index d848adc..ac1a5b9 100644 (file)
@@ -142,7 +142,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Voorbeeld",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Schr&ift:",stc7 ,98,114,40,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 9a8efab..fca7d91 100644 (file)
@@ -142,7 +142,7 @@ FONT 8, "MS Shell Dlg"
     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 |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
@@ -401,9 +401,9 @@ Oppgi en verdi mellom %d og %d."
     PD32_OUT_OF_MEMORY                    "Ikke mer minne."
     PD32_GENERIC_ERROR                    "En feil har oppstått."
     PD32_DRIVER_UNKNOWN                   "Ukjent skriverdriver."
-    PD32_NO_DEVICES                       "Before you can perform printer-related tasks \
-such as page setup or printing a document, you need to install a printer. \
-Please install one and retry."
+    PD32_NO_DEVICES                       "Du må installere en skriver før du \
+    kan gjøre skriver-relaterte oppgaver som å endre \ sideoppsettet og skrive ut et dokument. \
+    Installer en og prøv på nytt."
 
     PD32_DEFAULT_PRINTER                  "Standardskriver; "
     PD32_NR_OF_DOCUMENTS_IN_QUEUE         "Det er %d dokumenter i køen"
index 8924430..9fa0935 100644 (file)
@@ -144,7 +144,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Przyk³ad",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Skr&ypt:",stc7 ,98,114,40,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index f71cf78..91b95e2 100644 (file)
@@ -143,7 +143,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Exemplo",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index b6c8e6d..d059120 100644 (file)
@@ -142,7 +142,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Îáðàçåö",grp2,98,72,120,36,WS_GROUP
     CTEXT           "ÀàÁáAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 3fdbfab..260440e 100644 (file)
@@ -142,7 +142,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Vzorec",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 3834ba5..fe06309 100644 (file)
@@ -144,7 +144,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Vzorka",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index cd5c561..21d8251 100644 (file)
@@ -140,7 +140,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Test",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index b416217..323c24d 100644 (file)
@@ -142,7 +142,7 @@ FONT 8, "MS Shell Dlg"
     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 |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index a46acb7..824de73 100644 (file)
@@ -147,7 +147,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Egzimpe",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZzÅåÇçÛû",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 33f5260..1dc73ae 100644 (file)
@@ -93,7 +93,7 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "¹ Àý",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
     LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
-    COMBOBOX        cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
                    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
index 5b7027f..2af10ee 100644 (file)
@@ -2096,14 +2096,6 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
                lppd->hDevMode = GlobalAlloc(GMEM_MOVEABLE,
                                        lpdm->dmSize + lpdm->dmDriverExtra);
            } else {
-               WORD locks;
-               if((locks = (GlobalFlags(lppd->hDevMode) & GMEM_LOCKCOUNT))) {
-                   WARN("hDevMode has %d locks on it. Unlocking it now\n", locks);
-                   while(locks--) {
-                       GlobalUnlock(lppd->hDevMode);
-                       TRACE("Now got %d locks\n", locks);
-                   }
-               }
                lppd->hDevMode = GlobalReAlloc(lppd->hDevMode,
                                               lpdm->dmSize + lpdm->dmDriverExtra,
                                               GMEM_MOVEABLE);
@@ -2111,14 +2103,6 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
            lpdmReturn = GlobalLock(lppd->hDevMode);
            memcpy(lpdmReturn, lpdm, lpdm->dmSize + lpdm->dmDriverExtra);
 
-           if (lppd->hDevNames != 0) {
-               WORD locks;
-               if((locks = (GlobalFlags(lppd->hDevNames) & GMEM_LOCKCOUNT))) {
-                   WARN("hDevNames has %d locks on it. Unlocking it now\n", locks);
-                   while(locks--)
-                       GlobalUnlock(lppd->hDevNames);
-               }
-           }
            PRINTDLG_CreateDevNames(&(lppd->hDevNames),
                    di->pDriverPath,
                    pi->pPrinterName,