Sync to Wine-0_9_3: 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. Modified: trunk/reactos/lib/comdlg32/cdlg_Bg.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Ca.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Cn.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Cs.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Da.rc Modified: trunk/reactos/lib/comdlg32/cdlg_De.rc Modified: trunk/reactos/lib/comdlg32/cdlg_En.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Es.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Fi.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Fr.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Hu.rc Modified: trunk/reactos/lib/comdlg32/cdlg_It.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Ja.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Nl.rc Modified: trunk/reactos/lib/comdlg32/cdlg_No.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Pl.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Pt.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Ru.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Si.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Sk.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Sv.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Uk.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Wa.rc Modified: trunk/reactos/lib/comdlg32/cdlg_Zh.rc Modified: trunk/reactos/lib/comdlg32/printdlg.c _____
Modified: trunk/reactos/lib/comdlg32/cdlg_Bg.rc --- trunk/reactos/lib/comdlg32/cdlg_Bg.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Bg.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@
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 @@ 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 õ¯Û¾ýÕÝ?Ó Ô ¯´Ó°ÛÓ?Ó" _____
Modified: trunk/reactos/lib/comdlg32/cdlg_Ca.rc --- trunk/reactos/lib/comdlg32/cdlg_Ca.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Ca.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Cn.rc --- trunk/reactos/lib/comdlg32/cdlg_Cn.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Cn.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Cs.rc --- trunk/reactos/lib/comdlg32/cdlg_Cs.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Cs.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Da.rc --- trunk/reactos/lib/comdlg32/cdlg_Da.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Da.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_De.rc --- trunk/reactos/lib/comdlg32/cdlg_De.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_De.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -173,7 +173,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_En.rc --- trunk/reactos/lib/comdlg32/cdlg_En.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_En.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@
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 @@ 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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Es.rc --- trunk/reactos/lib/comdlg32/cdlg_Es.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Es.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Fi.rc --- trunk/reactos/lib/comdlg32/cdlg_Fi.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Fi.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Fr.rc --- trunk/reactos/lib/comdlg32/cdlg_Fr.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Fr.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -146,7 +146,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Hu.rc --- trunk/reactos/lib/comdlg32/cdlg_Hu.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Hu.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -141,7 +141,7 @@
GROUPBOX "Minta",grp2,98,72,120,36,WS_GROUP CTEXT "Aa?ßi§?¹",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 @@ 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?ßi§?¹",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" -} - _____
Modified: trunk/reactos/lib/comdlg32/cdlg_It.rc --- trunk/reactos/lib/comdlg32/cdlg_It.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_It.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Ja.rc --- trunk/reactos/lib/comdlg32/cdlg_Ja.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Ja.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Nl.rc --- trunk/reactos/lib/comdlg32/cdlg_Nl.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Nl.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_No.rc --- trunk/reactos/lib/comdlg32/cdlg_No.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_No.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@
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 @@ 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" _____
Modified: trunk/reactos/lib/comdlg32/cdlg_Pl.rc --- trunk/reactos/lib/comdlg32/cdlg_Pl.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Pl.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -144,7 +144,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Pt.rc --- trunk/reactos/lib/comdlg32/cdlg_Pt.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Pt.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -143,7 +143,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Ru.rc --- trunk/reactos/lib/comdlg32/cdlg_Ru.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Ru.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Si.rc --- trunk/reactos/lib/comdlg32/cdlg_Si.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Si.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Sk.rc --- trunk/reactos/lib/comdlg32/cdlg_Sk.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Sk.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -144,7 +144,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Sv.rc --- trunk/reactos/lib/comdlg32/cdlg_Sv.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Sv.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -140,7 +140,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Uk.rc --- trunk/reactos/lib/comdlg32/cdlg_Uk.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Uk.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -142,7 +142,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Wa.rc --- trunk/reactos/lib/comdlg32/cdlg_Wa.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Wa.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -147,7 +147,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/cdlg_Zh.rc --- trunk/reactos/lib/comdlg32/cdlg_Zh.rc 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/cdlg_Zh.rc 2005-12-12 22:44:46 UTC (rev 20129) @@ -93,7 +93,7 @@
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 }
_____
Modified: trunk/reactos/lib/comdlg32/printdlg.c --- trunk/reactos/lib/comdlg32/printdlg.c 2005-12-12 22:24:42 UTC (rev 20128) +++ trunk/reactos/lib/comdlg32/printdlg.c 2005-12-12 22:44:46 UTC (rev 20129) @@ -2096,14 +2096,6 @@
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 @@ 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,
-
gvg＠svn.reactos.com