From 4ae7fa84aeaf3fae168e96389f00677e97109958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Mon, 12 Dec 2005 22:44:46 +0000 Subject: [PATCH] =?UTF-8?q?Sync=20to=20Wine-0=5F9=5F3:=20Michael=20Jung=20?= =?UTF-8?q?=20-=20Initialize=20OLE=20instead=20?= =?UTF-8?q?of=20COM=20only=20in=20order=20to=20enable=20Drag=20and=20Drop.?= =?UTF-8?q?=20Robert=20Shearman=20=20-=20comdlg32:=20?= =?UTF-8?q?Don't=20worry=20if=20an=20HGLOBAL=20passed=20to=20printdlg=20is?= =?UTF-8?q?=20already=20locked.=20YunSong=20Hwang=20?= =?UTF-8?q?=20-=20Update=20Korean=20translations.=20Milko=20Krachounov=20=20-=20Update=20the=20Bulgarian=20resources=20fo?= =?UTF-8?q?r=20commdlg=20and=20regedit.=20Pavel=20Roskin=20=20-=20Improve=20script=20selection=20combobox=20in=20the=20fo?= =?UTF-8?q?nt=20selection=20dialog=20-=20set=20=20=20height=20to=2090=20(t?= =?UTF-8?q?he=20old=20value=20of=2010=20could=20only=20fit=20a=20single=20?= =?UTF-8?q?line)=20and=20=20=20remove=20CBS=5FOWNERDRAWFIXED=20flag=20to?= =?UTF-8?q?=20trim=20excessive=20height=20from=20the=20list=20=20=20items.?= =?UTF-8?q?=20Alexander=20N.=20S=C3=B8rnes=20=20-?= =?UTF-8?q?=20Update=20Norwegian=20Bokmaal=20resources.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/trunk/; revision=20129 --- reactos/lib/comdlg32/cdlg_Bg.rc | 8 +-- reactos/lib/comdlg32/cdlg_Ca.rc | 2 +- reactos/lib/comdlg32/cdlg_Cn.rc | 2 +- reactos/lib/comdlg32/cdlg_Cs.rc | 2 +- reactos/lib/comdlg32/cdlg_Da.rc | 2 +- reactos/lib/comdlg32/cdlg_De.rc | 2 +- reactos/lib/comdlg32/cdlg_En.rc | 4 +- reactos/lib/comdlg32/cdlg_Es.rc | 2 +- reactos/lib/comdlg32/cdlg_Fi.rc | 2 +- reactos/lib/comdlg32/cdlg_Fr.rc | 2 +- reactos/lib/comdlg32/cdlg_Hu.rc | 95 +-------------------------------- reactos/lib/comdlg32/cdlg_It.rc | 2 +- reactos/lib/comdlg32/cdlg_Ja.rc | 2 +- reactos/lib/comdlg32/cdlg_Nl.rc | 2 +- reactos/lib/comdlg32/cdlg_No.rc | 8 +-- reactos/lib/comdlg32/cdlg_Pl.rc | 2 +- reactos/lib/comdlg32/cdlg_Pt.rc | 2 +- reactos/lib/comdlg32/cdlg_Ru.rc | 2 +- reactos/lib/comdlg32/cdlg_Si.rc | 2 +- reactos/lib/comdlg32/cdlg_Sk.rc | 2 +- reactos/lib/comdlg32/cdlg_Sv.rc | 2 +- reactos/lib/comdlg32/cdlg_Uk.rc | 2 +- reactos/lib/comdlg32/cdlg_Wa.rc | 2 +- reactos/lib/comdlg32/cdlg_Zh.rc | 2 +- reactos/lib/comdlg32/printdlg.c | 16 ------ 25 files changed, 31 insertions(+), 140 deletions(-) diff --git a/reactos/lib/comdlg32/cdlg_Bg.rc b/reactos/lib/comdlg32/cdlg_Bg.rc index 5e0c1309d2c..33a756a12ad 100644 --- a/reactos/lib/comdlg32/cdlg_Bg.rc +++ b/reactos/lib/comdlg32/cdlg_Bg.rc @@ -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 äîêóìåíòà â îïàøêàòà" diff --git a/reactos/lib/comdlg32/cdlg_Ca.rc b/reactos/lib/comdlg32/cdlg_Ca.rc index 73f91aed414..b399ca44e31 100644 --- a/reactos/lib/comdlg32/cdlg_Ca.rc +++ b/reactos/lib/comdlg32/cdlg_Ca.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Cn.rc b/reactos/lib/comdlg32/cdlg_Cn.rc index baaa9fb10f9..bf60c522068 100644 --- a/reactos/lib/comdlg32/cdlg_Cn.rc +++ b/reactos/lib/comdlg32/cdlg_Cn.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Cs.rc b/reactos/lib/comdlg32/cdlg_Cs.rc index a3f0302a733..c3c2184419a 100644 --- a/reactos/lib/comdlg32/cdlg_Cs.rc +++ b/reactos/lib/comdlg32/cdlg_Cs.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Da.rc b/reactos/lib/comdlg32/cdlg_Da.rc index 4cac09c932d..f684deb5c02 100644 --- a/reactos/lib/comdlg32/cdlg_Da.rc +++ b/reactos/lib/comdlg32/cdlg_Da.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_De.rc b/reactos/lib/comdlg32/cdlg_De.rc index 5cdedb28468..d3c6d25ad2b 100644 --- a/reactos/lib/comdlg32/cdlg_De.rc +++ b/reactos/lib/comdlg32/cdlg_De.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_En.rc b/reactos/lib/comdlg32/cdlg_En.rc index 732670292df..1cf90b25c2a 100644 --- a/reactos/lib/comdlg32/cdlg_En.rc +++ b/reactos/lib/comdlg32/cdlg_En.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Es.rc b/reactos/lib/comdlg32/cdlg_Es.rc index 84c1b735f6b..ff2e62318dd 100644 --- a/reactos/lib/comdlg32/cdlg_Es.rc +++ b/reactos/lib/comdlg32/cdlg_Es.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Fi.rc b/reactos/lib/comdlg32/cdlg_Fi.rc index 569031036a5..f81590d0eba 100644 --- a/reactos/lib/comdlg32/cdlg_Fi.rc +++ b/reactos/lib/comdlg32/cdlg_Fi.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Fr.rc b/reactos/lib/comdlg32/cdlg_Fr.rc index 63f2b6d4009..66c721d226a 100644 --- a/reactos/lib/comdlg32/cdlg_Fr.rc +++ b/reactos/lib/comdlg32/cdlg_Fr.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Hu.rc b/reactos/lib/comdlg32/cdlg_Hu.rc index 40ebf20560a..58cf236e7cd 100644 --- a/reactos/lib/comdlg32/cdlg_Hu.rc +++ b/reactos/lib/comdlg32/cdlg_Hu.rc @@ -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" -} - diff --git a/reactos/lib/comdlg32/cdlg_It.rc b/reactos/lib/comdlg32/cdlg_It.rc index eb6ecef2ae9..66067394826 100644 --- a/reactos/lib/comdlg32/cdlg_It.rc +++ b/reactos/lib/comdlg32/cdlg_It.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Ja.rc b/reactos/lib/comdlg32/cdlg_Ja.rc index 262883bf0c1..05b4bbc827f 100644 --- a/reactos/lib/comdlg32/cdlg_Ja.rc +++ b/reactos/lib/comdlg32/cdlg_Ja.rc @@ -142,7 +142,7 @@ FONT 9, "MS UI Gothic" GROUPBOX "ƒTƒ“ƒvƒ‹",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE LTEXT "•¶ŽšƒZƒbƒg(&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 } diff --git a/reactos/lib/comdlg32/cdlg_Nl.rc b/reactos/lib/comdlg32/cdlg_Nl.rc index d848adcb30f..ac1a5b9f439 100644 --- a/reactos/lib/comdlg32/cdlg_Nl.rc +++ b/reactos/lib/comdlg32/cdlg_Nl.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_No.rc b/reactos/lib/comdlg32/cdlg_No.rc index 9a8efab7fac..fca7d912e13 100644 --- a/reactos/lib/comdlg32/cdlg_No.rc +++ b/reactos/lib/comdlg32/cdlg_No.rc @@ -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" diff --git a/reactos/lib/comdlg32/cdlg_Pl.rc b/reactos/lib/comdlg32/cdlg_Pl.rc index 89244309659..9fa0935937b 100644 --- a/reactos/lib/comdlg32/cdlg_Pl.rc +++ b/reactos/lib/comdlg32/cdlg_Pl.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Pt.rc b/reactos/lib/comdlg32/cdlg_Pt.rc index f71cf78736d..91b95e200f6 100644 --- a/reactos/lib/comdlg32/cdlg_Pt.rc +++ b/reactos/lib/comdlg32/cdlg_Pt.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Ru.rc b/reactos/lib/comdlg32/cdlg_Ru.rc index b6c8e6dd5d1..d059120d0b8 100644 --- a/reactos/lib/comdlg32/cdlg_Ru.rc +++ b/reactos/lib/comdlg32/cdlg_Ru.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Si.rc b/reactos/lib/comdlg32/cdlg_Si.rc index 3fdbfab61b7..260440e82a4 100644 --- a/reactos/lib/comdlg32/cdlg_Si.rc +++ b/reactos/lib/comdlg32/cdlg_Si.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Sk.rc b/reactos/lib/comdlg32/cdlg_Sk.rc index 3834ba582f9..fe06309a6ac 100644 --- a/reactos/lib/comdlg32/cdlg_Sk.rc +++ b/reactos/lib/comdlg32/cdlg_Sk.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Sv.rc b/reactos/lib/comdlg32/cdlg_Sv.rc index cd5c56144b6..21d82510ecf 100644 --- a/reactos/lib/comdlg32/cdlg_Sv.rc +++ b/reactos/lib/comdlg32/cdlg_Sv.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Uk.rc b/reactos/lib/comdlg32/cdlg_Uk.rc index b416217b66c..323c24d9e70 100644 --- a/reactos/lib/comdlg32/cdlg_Uk.rc +++ b/reactos/lib/comdlg32/cdlg_Uk.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Wa.rc b/reactos/lib/comdlg32/cdlg_Wa.rc index a46acb749c0..824de730339 100644 --- a/reactos/lib/comdlg32/cdlg_Wa.rc +++ b/reactos/lib/comdlg32/cdlg_Wa.rc @@ -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 } diff --git a/reactos/lib/comdlg32/cdlg_Zh.rc b/reactos/lib/comdlg32/cdlg_Zh.rc index 33f5260c10e..1dc73ae939b 100644 --- a/reactos/lib/comdlg32/cdlg_Zh.rc +++ b/reactos/lib/comdlg32/cdlg_Zh.rc @@ -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 } diff --git a/reactos/lib/comdlg32/printdlg.c b/reactos/lib/comdlg32/printdlg.c index 5b7027f57d7..2af10ee50f4 100644 --- a/reactos/lib/comdlg32/printdlg.c +++ b/reactos/lib/comdlg32/printdlg.c @@ -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,