15 Sep
2007
15 Sep
'07
5:06 p.m.
Author: winesync
Date: Sat Sep 15 21:06:51 2007
New Revision: 29063
URL: http://svn.reactos.org/svn/reactos?rev=29063&view=rev
Log:
Autosyncing with Wine HEAD
Modified:
trunk/reactos/dll/win32/comdlg32/cdlg_No.rc
trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc
trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc
trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild
trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff
trunk/reactos/dll/win32/comdlg32/fontdlg.c
trunk/reactos/dll/win32/comdlg32/printdlg.c
trunk/reactos/dll/win32/comdlg32/printdlg16.c
Modified: trunk/reactos/dll/win32/comdlg32/cdlg_No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_No…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/cdlg_No.rc (original)
+++ trunk/reactos/dll/win32/comdlg32/cdlg_No.rc Sat Sep 15 21:06:51 2007
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Alexander N. Sørnes
+ * Copyright 2005-2007 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
@@ -134,8 +134,8 @@
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
+ CHECKBOX "Gjennomstre&ket", chx1, 10,82,70,10, BS_AUTOCHECKBOX |
WS_TABSTOP
+ CHECKBOX "&Understreket", chx2, 10,94,70,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
@@ -189,10 +189,10 @@
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
+ CHECKBOX "Skill &mellom store og små bokstaver", chx2, 4, 42, 125, 12,
BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Retning", grp1, 137, 23, 40, 36
+ CONTROL "&Opp", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD |
WS_VISIBLE | WS_GROUP | WS_TABSTOP, 141, 31, 30, 12
+ CONTROL "&Ned", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD |
WS_VISIBLE | WS_TABSTOP, 141, 44, 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
@@ -210,7 +210,7 @@
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
+ CHECKBOX "Skill mellom store og små bokstaver", chx2, 5, 62, 125, 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
Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Pt…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc (original)
+++ trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc Sat Sep 15 21:06:51 2007
@@ -1,7 +1,7 @@
/*
* Copyright 1997 Ricardo R. Massaro
* Copyright 2003 Marcelo Duarte
- * Copyright 2006 Américo José Melo
+ * Copyright 2006-2007 Américo José Melo
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -55,7 +55,7 @@
LTEXT "Nome do &Ficheiro:", 1090, 6, 6, 76, 9
EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Directórios:", -1, 110, 6, 92, 9
+ LTEXT "&Directórios:", -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 "Listar Ficheiros do &Tipo:", 1089, 6, 104, 90, 9
@@ -102,7 +102,7 @@
LTEXT "Nome do &Ficheiro:", 1090, 6, 6, 76, 9
EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Directórios:", -1, 110, 6, 92, 9
+ LTEXT "&Directórios:", -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 "Listar Ficheiros do &Tipo:", 1089, 6, 104, 90, 9
@@ -149,16 +149,16 @@
{
LTEXT "Impressora:", 1088, 6, 6, 40, 9
LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Faixa de Impressão", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ GROUPBOX "Faixa de Impressão", 1072, 6, 30, 160, 65, BS_GROUPBOX
RADIOBUTTON "&Tudo", 1056, 16, 45, 60, 12
- RADIOBUTTON "S&elecção", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Páginas", 1058, 16, 75, 60, 12
+ RADIOBUTTON "S&elecção", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Páginas", 1058, 16, 75, 60, 12
DEFPUSHBUTTON "Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP |
WS_TABSTOP
PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
LTEXT "&De:", 1090, 60, 80, 30, 9
- LTEXT "&Até:", 1091, 120, 80, 30, 9
- LTEXT "&Qualidade de Impressão:", 1092, 6, 100, 76, 9
+ LTEXT "&Até:", 1091, 120, 80, 30, 9
+ LTEXT "&Qualidade de Impressão:", 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 "Imprimir para Ficheiro", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX |
WS_GROUP | WS_TABSTOP
CHECKBOX "C&ondensado", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP
| WS_TABSTOP
@@ -196,25 +196,25 @@
PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Configurações de Impressão"
+CAPTION "Configurações de Impressão"
FONT 8, "MS Shell Dlg"
{
GROUPBOX "Impressora", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Impressora Prdefinida", 1056, 16, 20, 80, 12
+ RADIOBUTTON "&Impressora Predefinida", 1056, 16, 20, 80, 12
LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Impressora &EspecÃfica", 1057, 16, 50, 80, 12
+ RADIOBUTTON "Impressora &Específica", 1057, 16, 50, 80, 12
COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL
| CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP |
WS_TABSTOP
PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientação", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ GROUPBOX "Orientação", 1073, 6, 85, 100, 50, BS_GROUPBOX
RADIOBUTTON "&Retrato", 1058, 50, 100, 40, 12
RADIOBUTTON "&Paisagem", 1059, 50, 115, 40, 12
ICON "LANDSCAP", 1097, 10, 95, 32, 32
ICON "PORTRAIT", 1098, 10, 95, 32, 32
GROUPBOX "Papel", 1074, 120, 85, 180, 50, BS_GROUPBOX
LTEXT "&Tamanho", 1089, 130, 95, 30, 9
- LTEXT "&Fonte de Alimentação", 1090, 130, 110, 30, 9
+ LTEXT "&Fonte de Alimentação", 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
}
@@ -323,6 +323,40 @@
PUSHBUTTON "&o",713,300,200,4,14 /* just a dummy: 'o' is like
&o in "solid&o" */
}
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Cor"
+FONT 8, "MS Shell Dlg"
+{
+LTEXT "Cores &Básicas:", 1088, 4, 4, 140, 10
+LTEXT "&Cores do Utilizador:", 1089, 4, 106, 140, 10
+LTEXT "Colorido|Sólid&o", 1090, 150, 151, 48, 10
+LTEXT "Ver&melho:", 726 /*1094*/,249,126,24,10
+EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+LTEXT "&Verde:",727/*1095*/,249,140,24,10
+EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+LTEXT "A&zul:",728 /*1096*/,249,154,24,10
+EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+LTEXT "Mat&iz:" ,723 /*1091*/,202,126,22,10
+EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+LTEXT "Sa&t:" ,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", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP |
WS_TABSTOP
+PUSHBUTTON "Cancelar", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+PUSHBUTTON "Aj&uda", 1038,100,166, 44, 14
+PUSHBUTTON "&Adicionar Cor Personalizada", 712/*1024*/, 152, 166, 142,
14, WS_GROUP | WS_TABSTOP
+PUSHBUTTON "&Definir Cores Personalizadas >>", 719/*1025*/, 4, 150,
142, 14, WS_GROUP | WS_TABSTOP
+PUSHBUTTON "&o",713,300,200,4,14 /* just a dummy: 'o' is like
&o in "solid&o" */
+}
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
@@ -354,12 +388,12 @@
LTEXT "&Procurar:", -1, 4, 8, 42, 8
EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
CHECKBOX "Palavra &Inteira", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX |
WS_GROUP | WS_TABSTOP
- CHECKBOX "&Maisculas/minusculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX |
WS_TABSTOP
- GROUPBOX "Direcção", 1072, 107, 26, 68, 28
+ CHECKBOX "&Maiúsculas/minúsculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX |
WS_TABSTOP
+ GROUPBOX "Direcção", 1072, 107, 26, 68, 28
CONTROL "A&cima", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD
| WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
CONTROL "A&baixo", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD
| WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "&Find Next", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "&Procurar Próximo", IDOK, 182, 5, 50, 14, WS_GROUP |
WS_TABSTOP
PUSHBUTTON "Cancelar", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
}
@@ -398,9 +432,9 @@
LTEXT "Substituir Pa&ra:", -1, 4, 26, 48, 8
EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
CHECKBOX "Palavra &inteira", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX |
WS_GROUP | WS_TABSTOP
- CHECKBOX "&Maisculas/minsculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX |
WS_TABSTOP
-
- DEFPUSHBUTTON "Procurar Próxima", IDOK, 174, 4, 50, 14, WS_GROUP |
WS_TABSTOP | BS_DEFPUSHBUTTON
+ CHECKBOX "&Maiúsculas/minúsculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX |
WS_TABSTOP
+
+ DEFPUSHBUTTON "Procurar Próxima", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP
| BS_DEFPUSHBUTTON
PUSHBUTTON "&Substituir", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "Substituir &Todas", psh2, 174, 38, 50, 14, WS_GROUP |
WS_TABSTOP
PUSHBUTTON "Cancelar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
@@ -463,7 +497,7 @@
PUSHBUTTON "&Ajuda", pshHelp, 50, 161, 50,14, WS_GROUP
GROUPBOX "Impressora", grp4, 8, 4, 272,84, WS_GROUP
- CONTROL "Imprimir em &ficheiro", chx1,
"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+ CONTROL "Imprimir para &ficheiro", chx1,
"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
PUSHBUTTON "Propri&edades", psh2, 212, 17, 60,14, WS_GROUP
LTEXT "&Nome:", stc6, 16, 20, 36,8
COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL |
WS_GROUP | WS_TABSTOP
@@ -471,25 +505,25 @@
LTEXT "Estado 'Dummy'", stc12, 52, 36, 224,10,
SS_NOPREFIX | SS_LEFTNOWORDWRAP
LTEXT "Tipo:", stc7, 16, 48, 36,10, SS_NOPREFIX
LTEXT "Tipo 'Dummy'", stc11, 52, 48, 224,10, SS_NOPREFIX
| SS_LEFTNOWORDWRAP
- LTEXT "Onde:", stc10, 16, 60, 36,10, SS_NOPREFIX
- LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX |
SS_LEFTNOWORDWRAP
- LTEXT "Comentário:", stc9, 16, 72, 36,10, SS_NOPREFIX
- LTEXT "Comentário 'Dummy'", stc13, 52, 72, 152,10,
SS_NOPREFIX | SS_LEFTNOWORDWRAP
-
- GROUPBOX "Cópias", grp2, 160, 92, 120,64, WS_GROUP
- LTEXT "Nmero de &cópias:", stc5, 168,108, 68, 8
+ LTEXT "Localizaça:", stc10, 16, 60, 36,10, SS_NOPREFIX
+ LTEXT "Localizaçao 'Dummy'", stc14, 52, 60, 224,10,
SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Comentário:", stc9, 16, 72, 36,10, SS_NOPREFIX
+ LTEXT "Comentário 'Dummy'", stc13, 52, 72, 152,10,
SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+ GROUPBOX "Cópias", grp2, 160, 92, 120,64, WS_GROUP
+ LTEXT "Número de &cópias:", stc5, 168,108, 68, 8
ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE
CONTROL "&Agrupar", chx2,"Button",BS_AUTOCHECKBOX |
WS_GROUP | WS_TABSTOP,240,130,36,12
EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER
- GROUPBOX "Faixa de impressão", grp1, 8,92, 144,64, WS_GROUP
+ GROUPBOX "Faixa de impressão", grp1, 8,92, 144,64, WS_GROUP
CONTROL "&Todos", rad1,"Button",BS_AUTORADIOBUTTON
| WS_GROUP | WS_TABSTOP,16,106,64,12
- CONTROL
"Páginas", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
- CONTROL
"Selecção", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+ CONTROL
"Páginas", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+ CONTROL
"Selecção", 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 "&de:", stc2, 52,124, 20,8
- RTEXT "&até", stc3, 100,124, 16,8
+ RTEXT "&até", stc3, 100,124, 16,8
}
@@ -535,7 +569,7 @@
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 "Print Setup"
+CAPTION "Configuração de Impressão"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,180,156,50,14,WS_GROUP
@@ -550,10 +584,10 @@
LTEXT "EStado 'Dummy'", stc12, 52, 36, 224, 10, SS_NOPREFIX |
SS_LEFTNOWORDWRAP
LTEXT "Tipo:", stc7, 16, 48, 36, 10, SS_NOPREFIX
LTEXT "Tipo 'Dummy'", stc11, 52, 48, 224, 10, SS_NOPREFIX |
SS_LEFTNOWORDWRAP
- LTEXT "Localização:", stc10, 16, 60, 36, 10, SS_NOPREFIX
- LTEXT "Localização 'Dummy'", stc14, 52, 60, 224, 10,
SS_NOPREFIX | SS_LEFTNOWORDWRAP
- LTEXT "Comentário", stc9, 16, 72, 36, 10, SS_NOPREFIX
- LTEXT "Comentário 'Dummy'", stc13, 52, 72, 224, 10,
SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Localização:", stc10, 16, 60, 36, 10, SS_NOPREFIX
+ LTEXT "Localização 'Dummy'", stc14, 52, 60, 224, 10, SS_NOPREFIX
| SS_LEFTNOWORDWRAP
+ LTEXT "Comentário", stc9, 16, 72, 36, 10, SS_NOPREFIX
+ LTEXT "Comentário 'Dummy'", stc13, 52, 72, 224, 10, SS_NOPREFIX
| SS_LEFTNOWORDWRAP
GROUPBOX "Papel", grp2, 8, 92, 164, 56, WS_GROUP
LTEXT "&Tamanho:", stc2, 16, 108, 36, 8
@@ -561,7 +595,7 @@
LTEXT "&Origem:", stc3, 16, 128, 36, 8
COMBOBOX cmb3, 52, 126, 112, 112, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientação", grp1, 180, 92, 100, 56, WS_GROUP
+ GROUPBOX "Orientação", grp1, 180, 92, 100, 56, WS_GROUP
ICON "", ico1, 195, 112, 18, 20, WS_GROUP
CONTROL "&Retrato", rad1, "Button",
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 224, 106, 52, 12
CONTROL "&Paisagem", rad2, "Button", BS_AUTORADIOBUTTON,
224, 126, 52, 12
@@ -604,7 +638,7 @@
PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Configurações de Página"
+CAPTION "Configurações de Página"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
@@ -615,7 +649,7 @@
COMBOBOX cmb2, 64, 110, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
LTEXT "&Bandeja:", stc3, 16, 132, 36, 8
COMBOBOX cmb3, 64, 130, 160, 160,
CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
- GROUPBOX "Orientaçao", grp1, 8, 156, 64, 56, BS_GROUPBOX
+ GROUPBOX "Orientação", grp1, 8, 156, 64, 56, BS_GROUPBOX
AUTORADIOBUTTON "&Retrato", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
GROUPBOX "Bordas", grp4, 80, 156, 152, 56, BS_GROUPBOX
@@ -678,7 +712,7 @@
LTEXT "Ficheiros do &tipo:",IDC_FILETYPESTATIC,5,131,48,16, SS_NOTIFY
COMBOBOX IDC_FILETYPE,54,129,155,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Abrir como &apenas-
leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,54,148,74,10
+ CONTROL "Abrir como
&apenas-leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,54,148,74,10
DEFPUSHBUTTON "&Abrir", IDOK,222,110,50,14
PUSHBUTTON "Cancelar", IDCANCEL,222,128,50,14
@@ -704,12 +738,12 @@
STRINGTABLE DISCARDABLE
{
- IDS_ABOUTBOX "&Acerca do FolderPicker Test"
+ IDS_ABOUTBOX "&Acerca do Teste FolderPicker"
IDS_DOCUMENTFOLDERS "Pastas de Documentos"
IDS_PERSONAL "Os Meus Documentos"
IDS_FAVORITES "Favoritos"
- IDS_PATH "Localização do Sistema"
- IDS_DESKTOP "Ãrea de Trabalho"
+ IDS_PATH "Localização do Sistema"
+ IDS_DESKTOP "Ecrã"
IDS_FONTS "Tipos de Letra"
IDS_MYCOMPUTER "O Meu Computador"
}
@@ -736,15 +770,15 @@
STRINGTABLE DISCARDABLE
{
IDS_SYSTEMFOLDERS "Pastas do Sistema"
- IDS_LOCALHARDRIVES "Discos RÃgidos Locais"
- IDS_FILENOTFOUND "Ficheiro não encontrado"
+ IDS_LOCALHARDRIVES "Discos Rígidos Locais"
+ IDS_FILENOTFOUND "Ficheiro não encontrado"
IDS_VERIFYFILE "Por favor verifique se foi fornecido o nome correcto do
ficheiro"
- IDS_CREATEFILE "O ficheiro não existe\nGostaria de o criar"
- IDS_OVERWRITEFILE "O ficheiro já existe.\nGostaria de o
substituir?"
- IDS_INVALID_FILENAME_TITLE "Caracter(es) inválidos na localização"
- IDS_INVALID_FILENAME "Um nome de ficheiro não pode conter quaisquer dos
seguintes caracteres: \n / : < > |"
- IDS_PATHNOTEXISTING "A localização não existe"
- IDS_FILENOTEXISTING "O ficheiro não existe"
+ IDS_CREATEFILE "O ficheiro não existe\nGostaria de o criar"
+ IDS_OVERWRITEFILE "O ficheiro já existe.\nGostaria de o substituir?"
+ IDS_INVALID_FILENAME_TITLE "Caracter(es) inválidos na localização"
+ IDS_INVALID_FILENAME "Um nome de ficheiro não pode conter quaisquer dos
seguintes caracteres: \n / : < > |"
+ IDS_PATHNOTEXISTING "A localização não existe"
+ IDS_FILENOTEXISTING "O ficheiro não existe"
}
@@ -763,11 +797,11 @@
STRINGTABLE DISCARDABLE
{
- IDS_UPFOLDER "Um NÃvel Acima"
+ IDS_UPFOLDER "Um Nível Acima"
IDS_NEWFOLDER "Criar Nova Pasta"
IDS_LISTVIEW "Lista"
IDS_REPORTVIEW "Detalhes"
- IDS_TODESKTOP "Ãrea de Trabalho"
+ IDS_TODESKTOP "Ecrã"
}
@@ -836,26 +870,26 @@
{
PD32_PRINT_TITLE "Imprimir"
- PD32_VALUE_UREADABLE "Entrada IlegÃvel"
- PD32_INVALID_PAGE_RANGE "Este valor não se encaixa na faixa de páginas\n\
-Por favor entre um valor entre %d e %d."
- PD32_FROM_NOT_ABOVE_TO "A entrada DE não pode exceder ATÃ"
- PD32_MARGINS_OVERLAP "As margens estão fora das medidas \
-do papel.\nPor favor reentre as margens."
- PD32_NR_OF_COPIES_EMPTY "O número de cópias não pode ter valor
vazio."
- PD32_TOO_LARGE_COPIES "Esta grande quantidade de cópias não é suportada \
-pela sua impressora.\nPor favor entre um valor entre 1 e %d."
- PD32_PRINT_ERROR "Ocorreu um erro de impressão."
- PD32_NO_DEFAULT_PRINTER "Não existe uma impressora predefinida."
- PD32_CANT_FIND_PRINTER "Não é possÃvel encontrar uma impressora."
- PD32_OUT_OF_MEMORY "Memória insuficiente."
+ PD32_VALUE_UREADABLE "Entrada Ilegível"
+ PD32_INVALID_PAGE_RANGE "Este valor não se encaixa na faixa de páginas\n\
+Por favor indique um valor entre %d e %d."
+ PD32_FROM_NOT_ABOVE_TO "A entrada DE não pode exceder ATÉ"
+ PD32_MARGINS_OVERLAP "As margens estão fora das medidas \
+do papel.\nPor favor indique as margens."
+ PD32_NR_OF_COPIES_EMPTY "O número de cópias não pode ter valor vazio."
+ PD32_TOO_LARGE_COPIES "Esta grande quantidade de cópias não é suportada \
+pela sua impressora.\nPor favor indique um valor entre 1 e %d."
+ PD32_PRINT_ERROR "Ocorreu um erro de impressão."
+ PD32_NO_DEFAULT_PRINTER "Não existe uma impressora predefinida."
+ PD32_CANT_FIND_PRINTER "Não é possível encontrar uma impressora."
+ PD32_OUT_OF_MEMORY "Memória insuficiente."
PD32_GENERIC_ERROR "Ocorreu algum erro."
PD32_DRIVER_UNKNOWN "Controlador de impressora desconhecido."
PD32_NO_DEVICES "Antes de realizar tarefas relacionadas
com a impressora \
-tais como configuração de páginas ou imprimir um documento, precisa instalar uma
impressora. \
+tais como configuração de páginas ou imprimir um documento, precisa instalar uma
impressora. \
Por favor instale uma e tente novamente."
- PD32_DEFAULT_PRINTER "Impressora Prdefinida; "
+ PD32_DEFAULT_PRINTER "Impressora Predefinida; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Existem %d documentos na fila"
PD32_MARGINS_IN_INCHES "Margens [polegadas]"
PD32_MARGINS_IN_MILIMETERS "Margens [mm]"
@@ -864,29 +898,29 @@
PD32_PRINTER_STATUS_READY "Pronto"
PD32_PRINTER_STATUS_PAUSED "Pausada; "
PD32_PRINTER_STATUS_ERROR "Erro; "
- PD32_PRINTER_STATUS_PENDING_DELETION "Exclusão pendente; "
+ PD32_PRINTER_STATUS_PENDING_DELETION "Exclusão pendente; "
PD32_PRINTER_STATUS_PAPER_JAM "Papel atolado; "
PD32_PRINTER_STATUS_PAPER_OUT "Sem papel; "
- PD32_PRINTER_STATUS_MANUAL_FEED "Alimentação manual; "
+ PD32_PRINTER_STATUS_MANUAL_FEED "Alimentação manual; "
PD32_PRINTER_STATUS_PAPER_PROBLEM "Problemas com o papel; "
PD32_PRINTER_STATUS_OFFLINE "Impressora desligada; "
PD32_PRINTER_STATUS_IO_ACTIVE "E/S Activa; "
PD32_PRINTER_STATUS_BUSY "Ocupada; "
PD32_PRINTER_STATUS_PRINTING "A imprimir; "
PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "A bandeja de saida encontra-se cheia;
"
- PD32_PRINTER_STATUS_NOT_AVAILABLE "Não disponÃvel; "
+ PD32_PRINTER_STATUS_NOT_AVAILABLE "Não disponível; "
PD32_PRINTER_STATUS_WAITING "A esperar; "
PD32_PRINTER_STATUS_PROCESSING "A processar; "
PD32_PRINTER_STATUS_INITIALIZING "A inicializar; "
PD32_PRINTER_STATUS_WARMING_UP "A aquecer; "
PD32_PRINTER_STATUS_TONER_LOW "Pouco toner; "
PD32_PRINTER_STATUS_NO_TONER "Sem toner; "
- PD32_PRINTER_STATUS_PAGE_PUNT "Lançar página; "
- PD32_PRINTER_STATUS_USER_INTERVENTION "Intervenção do utilizador; "
- PD32_PRINTER_STATUS_OUT_OF_MEMORY "Memória insuficiente; "
- PD32_PRINTER_STATUS_DOOR_OPEN "A impressora está aberta; "
- PD32_PRINTER_STATUS_SERVER_UNKNOWN "Servidor de impressão desconhecido;
"
- PD32_PRINTER_STATUS_POWER_SAVE "Modo económico; "
+ PD32_PRINTER_STATUS_PAGE_PUNT "Lançar página; "
+ PD32_PRINTER_STATUS_USER_INTERVENTION "Intervenção do utilizador; "
+ PD32_PRINTER_STATUS_OUT_OF_MEMORY "Memória insuficiente; "
+ PD32_PRINTER_STATUS_DOOR_OPEN "A impressora está aberta; "
+ PD32_PRINTER_STATUS_SERVER_UNKNOWN "Servidor de impressão desconhecido; "
+ PD32_PRINTER_STATUS_POWER_SAVE "Modo económico; "
}
@@ -919,10 +953,10 @@
IDS_COLOR_BLACK "Preto"
IDS_COLOR_MAROON "Castanho"
IDS_COLOR_GREEN "Verde"
- IDS_COLOR_OLIVE "Verde-oliva"
+ IDS_COLOR_OLIVE "Verde-oliveira"
IDS_COLOR_NAVY "Azul-marinho"
IDS_COLOR_PURPLE "Roxo"
- IDS_COLOR_TEAL "Azul-petróleo"
+ IDS_COLOR_TEAL "Azul-petróleo"
IDS_COLOR_GRAY "Cinza"
IDS_COLOR_SILVER "Prateado"
IDS_COLOR_RED "Vermelho"
@@ -951,7 +985,7 @@
STRINGTABLE DISCARDABLE
{
- IDS_FONT_SIZE "Selecione o tamanho da fonte entre %d e %d pontos."
+ IDS_FONT_SIZE "Seleccione o tamanho do tipo de letra entre %d e %d
pontos."
IDS_SAVE_BUTTON "&Gravar"
IDS_SAVE_IN "Gravar &em:"
IDS_SAVE "Gravar"
Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Uk…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc (original)
+++ trunk/reactos/dll/win32/comdlg32/cdlg_Uk.rc Sat Sep 15 21:06:51 2007
@@ -1,6 +1,5 @@
/*
* Copyright 2004 Ilya Korniyko
- * 2007 Artem Reznikov
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -31,7 +30,7 @@
LTEXT "&²ì'ÿ ôàéëó:", 1090, 6, 6, 76, 9
EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Ïàïêè:", -1, 110, 6, 92, 9
+ LTEXT "&Òåêè:", -1, 110, 6, 92, 9
LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_TABSTOP
LTEXT "Ïîêàçóâàòè ôàéëè &òèïó:", 1089, 6, 104, 90, 9
@@ -39,7 +38,7 @@
LTEXT "&Äèñêè:", 1091, 110, 104, 92, 9
COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL
| CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "³äêðèòè", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP |
WS_TABSTOP
- PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "³äì³íà", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Äîâ³äêà", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
CHECKBOX "&Ëèøå äëÿ ÷èòàííÿ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX |
BS_MULTILINE | WS_GROUP | WS_TABSTOP
}
@@ -53,7 +52,7 @@
LTEXT "&&²ì'ÿ ôàéëó:", 1090, 6, 6, 76, 9
EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Ïàïêè:", -1, 110, 6, 92, 9
+ LTEXT "&Òåêè:", -1, 110, 6, 92, 9
LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS |
LBS_DISABLENOSCROLL | WS_TABSTOP
LTEXT "Ïîêàçóâàòè ôàéëè &òèïó:", 1089, 6, 104, 90, 9
@@ -61,7 +60,7 @@
LTEXT "&Äèñêè:", 1091, 110, 104, 92, 9
COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL
| CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "Çáåðåãòè ÿê", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP
| WS_TABSTOP
- PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "³äì³íà", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Äîâ³äêà", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
CHECKBOX "&Ëèøå äëÿ ÷èòàííÿ", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX |
BS_MULTILINE | WS_GROUP | WS_TABSTOP
}
@@ -79,7 +78,7 @@
RADIOBUTTON "Â&èä³ëåííèé ôðàãìåíò", 1057, 16, 60, 60, 12
RADIOBUTTON "&Ñòîð³íêè", 1058, 16, 75, 60, 12
DEFPUSHBUTTON "Äðóê", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP |
WS_TABSTOP
- PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "³äì³íà", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "Âëàñòèâîñò³", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
LTEXT "&ç:", 1090, 60, 80, 30, 9
LTEXT "&äî:", 1091, 120, 80, 30, 9
@@ -101,7 +100,7 @@
RADIOBUTTON "&²íøèé ïðèíòåð", 1057, 16, 50, 80, 12
COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL
| CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP |
WS_TABSTOP
- PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "³äì³íà", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Íàñòðîéêà", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
GROUPBOX "Îð³ºíòàö³ÿ", 1073, 6, 85, 100, 50, BS_GROUPBOX
RADIOBUTTON "&Êíèæíà", 1058, 50, 100, 40, 12
@@ -131,7 +130,7 @@
COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
CBS_DISABLENOSCROLL |
WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP |
BS_DEFPUSHBUTTON
- PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "³äì³íà",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Çàñòîñóâàòè", 1026,218,40,40,14,WS_GROUP |
WS_TABSTOP
PUSHBUTTON "&Äîâ³äêà" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
GROUPBOX "Àòðèáóòè",1072,6,72,84,34,WS_GROUP
@@ -174,7 +173,7 @@
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 "Ñêàñóâàòè", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "³äì³íà", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "Äîâ³äêà", 1038,100,166, 44, 14
PUSHBUTTON "&Äîäàòè äî íàáîðó", 712/*1024*/, 152, 166, 142, 14,
WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Âèçíà÷èòè êîë³ð >>", 719/*1025*/, 4, 150, 142, 14,
WS_GROUP | WS_TABSTOP
@@ -196,7 +195,7 @@
CONTROL "Â&íèç", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD |
WS_VISIBLE | WS_TABSTOP, 152, 38, 30, 12
DEFPUSHBUTTON "Ç&íàéòè äàë³", IDOK, 190, 5, 50, 14, WS_GROUP | WS_TABSTOP
| BS_DEFPUSHBUTTON
- PUSHBUTTON "Ñêàñóâàòè", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "³äì³íà", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Äîâ³äêà", pshHelp , 190, 45, 50, 14, WS_GROUP | WS_TABSTOP
}
@@ -216,7 +215,7 @@
DEFPUSHBUTTON "Ç&íàéòè äàë³", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP
| BS_DEFPUSHBUTTON
PUSHBUTTON "&Çàì³íèòè", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "Çàì³íèòè &âñå", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Ñêàñóâàòè", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "³äì³íà", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Äîâ³äêà", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
}
@@ -227,7 +226,7 @@
FONT 8, "MS Shell Dlg"
{
DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP |
BS_DEFPUSHBUTTON
- PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 232,164, 48,14, WS_GROUP
+ PUSHBUTTON "³äì³íà", IDCANCEL, 232,164, 48,14, WS_GROUP
PUSHBUTTON "&Äîâ³äêà", pshHelp, 50, 161, 48,14, WS_GROUP
GROUPBOX "Ïðèíòåð", grp4, 8, 4, 272,84, WS_GROUP
@@ -267,7 +266,7 @@
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP
- PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,232,156,48,14
+ PUSHBUTTON "³äì³íà",IDCANCEL,232,156,48,14
/* PUSHBUTTON "ѳòêà...", psh5, 284,156,48,14 */
GROUPBOX "Ïðèíòåð", grp4, 8, 4, 272,84, WS_GROUP
@@ -315,25 +314,25 @@
CONTROL "Ëèøå äëÿ
&÷èòàííÿ",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,54,145,100,10
DEFPUSHBUTTON "&³äêðèòè", IDOK,222,110,50,14
- PUSHBUTTON "Ñêàñóâàòè", IDCANCEL,222,128,50,14
+ PUSHBUTTON "³äì³íà", IDCANCEL,222,128,50,14
PUSHBUTTON "&Äîâ³äêà", pshHelp,222,145,50,14
}
STRINGTABLE DISCARDABLE
{
- IDS_ABOUTBOX "&Ïðî òåñò Âèá³ðÏàïêè"
- IDS_DOCUMENTFOLDERS "Ïàïêè äîêóìåíò³â"
+ IDS_ABOUTBOX "&Ïðî òåñò Âèá³ðÒåêè"
+ IDS_DOCUMENTFOLDERS "Òåêè äîêóìåíò³â"
IDS_PERSONAL "Ìî¿ äîêóìåíòè"
IDS_FAVORITES "Çàêëàäêè"
IDS_PATH "Ñèñòåìíèé øëÿõ"
- IDS_DESKTOP "Ðîáî÷èé ñò³ë"
+ IDS_DESKTOP "Ñò³ëüíèöÿ"
IDS_FONTS "Øðèôòè"
IDS_MYCOMPUTER "̳é êîìï'þòåð"
}
STRINGTABLE DISCARDABLE
{
- IDS_SYSTEMFOLDERS "Ñèñòåìí³ ïàïêè"
+ IDS_SYSTEMFOLDERS "Ñèñòåìí³ òåêè"
IDS_LOCALHARDRIVES "Ëîêàëüí³ æîðñòê³ äèñêè"
IDS_FILENOTFOUND "Ôàéë íå çíàéäåíî"
IDS_VERIFYFILE "Ïåðåâ³ðòå, ÷è ïðàâèëüíî âêàçàíî ³ì'ÿ ôàéëó"
@@ -348,10 +347,10 @@
STRINGTABLE DISCARDABLE
{
IDS_UPFOLDER "Âãîðó íà îäèí ð³âåíü"
- IDS_NEWFOLDER "Ñòâîðèòè íîâó ïàïêó"
+ IDS_NEWFOLDER "Ñòâîðèòè íîâó òåêó"
IDS_LISTVIEW "Ñïèñîê"
IDS_REPORTVIEW "Ïîäðîáèö³"
- IDS_TODESKTOP "Ïåðåõ³ä íà ðîáî÷èé ñò³ë"
+ IDS_TODESKTOP "Ïåðåõ³ä íà ñò³ëüíèöþ"
}
STRINGTABLE DISCARDABLE
@@ -391,7 +390,7 @@
PD32_PRINTER_STATUS_PAPER_JAM "Ïàï³ð çàñòðÿã; "
PD32_PRINTER_STATUS_PAPER_OUT "Íå âèñòà÷ຠïàïåðó; "
PD32_PRINTER_STATUS_MANUAL_FEED "Ïîñòàâòå ïàï³ð âðó÷íó; "
- PD32_PRINTER_STATUS_PAPER_PROBLEM "Ïðîáëåìà ç ïàïåðîì; "
+ PD32_PRINTER_STATUS_PAPER_PROBLEM "Ïðîáëåìà ñ ïàïåðîì; "
PD32_PRINTER_STATUS_OFFLINE "Ïðèíòåð â ðåæèì³ offline; "
PD32_PRINTER_STATUS_IO_ACTIVE "Ââ³ä/Âèâ³ä àêòèâíèé; "
PD32_PRINTER_STATUS_BUSY "Çàéíÿòèé; "
Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild (original)
+++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild Sat Sep 15 21:06:51 2007
@@ -1,4 +1,6 @@
-<module name="comdlg32" type="win32dll"
baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32"
installname="comdlg32.dll" allowwarnings="true"
entrypoint="0">
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="comdlg32" type="win32dll"
baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32"
installname="comdlg32.dll" allowwarnings="true">
<importlibrary definition="comdlg32.spec.def" />
<include base="comdlg32">.</include>
<include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff (original)
+++ trunk/reactos/dll/win32/comdlg32/comdlg32_ros.diff Sat Sep 15 21:06:51 2007
@@ -220,7 +220,7 @@
SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon);
-@@ -2507,15 +2507,15 @@
+@@ -2513,15 +2513,15 @@
/* Save paper orientation into device context */
if(pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y)
@@ -239,7 +239,7 @@
else
FIXME("could not get dialog text for papersize cmbbox?\n");
-@@ -2523,7 +2523,7 @@
+@@ -2529,7 +2529,7 @@
paperword = SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA,
SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0), 0);
if (paperword != CB_ERR)
@@ -248,7 +248,7 @@
else
FIXME("could not get dialog text for papersize cmbbox?\n");
-@@ -2574,9 +2574,9 @@
+@@ -2580,9 +2580,9 @@
/* Save orientation */
if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y)
@@ -260,7 +260,7 @@
GlobalUnlock(pda->pdlg.hDevNames);
GlobalUnlock(pda->pdlg.hDevMode);
-@@ -2824,7 +2824,7 @@
+@@ -2834,7 +2834,7 @@
case cmb3:
if(msg == CBN_SELCHANGE){
DEVMODEA *dm = GlobalLock(pda->pdlg.hDevMode);
@@ -269,7 +269,7 @@
SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0), 0);
GlobalUnlock(pda->pdlg.hDevMode);
}
-@@ -2847,10 +2847,10 @@
+@@ -2857,10 +2857,10 @@
DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT);
ClosePrinter(hPrinter);
/* Changing paper */
@@ -282,7 +282,7 @@
DWORD tmp = pda->curdlg.ptPaperSize.x;
pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y;
pda->curdlg.ptPaperSize.y = tmp;
-@@ -2864,7 +2864,7 @@
+@@ -2874,7 +2874,7 @@
count = SendDlgItemMessageA(hDlg, cmb2, CB_GETCOUNT, 0, 0);
if(count != CB_ERR){
for(i=0; i<count; ++i){
@@ -291,16 +291,16 @@
SendDlgItemMessageA(hDlg, cmb2, CB_SETCURSEL, i, 0);
break;
}
-@@ -3168,7 +3168,7 @@
- }
- /* Set orientation radiobutton properly */
- dm = GlobalLock(pda->dlga->hDevMode);
-- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE)
-+ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
- CheckRadioButton(hDlg, rad1, rad2, rad2);
- else /* this is default if papersize is not set */
- CheckRadioButton(hDlg, rad1, rad2, rad1);
-@@ -3213,8 +3213,8 @@
+@@ -3180,7 +3180,7 @@
+ if(pda->dlga->hDevMode)
+ {
+ dm = GlobalLock(pda->dlga->hDevMode);
+- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE)
++ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
+ CheckRadioButton(hDlg, rad1, rad2, rad2);
+ else /* this is default if papersize is not set */
+ CheckRadioButton(hDlg, rad1, rad2, rad1);
+@@ -3226,8 +3226,8 @@
PRINTDLG_PS_ChangePrinterA(hDlg, pda);
dm = GlobalLock(pda->pdlg.hDevMode);
if(dm){
@@ -311,16 +311,16 @@
GlobalUnlock(pda->pdlg.hDevMode);
pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga,
pda->curdlg.ptPaperSize.x);
pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga,
pda->curdlg.ptPaperSize.y);
-@@ -3282,7 +3282,7 @@
-
- dm = GlobalLock(pda->dlga->hDevMode);
- /* Landscape orientation */
-- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE)
-+ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
- CheckRadioButton(hDlg, rad1, rad2, rad2);
- else /* this is default if papersize is not set */
- CheckRadioButton(hDlg, rad1, rad2, rad1);
-@@ -3422,7 +3422,7 @@
+@@ -3297,7 +3297,7 @@
+ {
+ dm = GlobalLock(pda->dlga->hDevMode);
+ /* Landscape orientation */
+- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE)
++ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
+ CheckRadioButton(hDlg, rad1, rad2, rad2);
+ else /* this is default if papersize is not set */
+ CheckRadioButton(hDlg, rad1, rad2, rad1);
+@@ -3439,7 +3439,7 @@
setupdlg->hDevMode = pdlg.hDevMode;
setupdlg->hDevNames = pdlg.hDevNames;
dm = GlobalLock(pdlg.hDevMode);
Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/fontdlg.c (original)
+++ trunk/reactos/dll/win32/comdlg32/fontdlg.c Sat Sep 15 21:06:51 2007
@@ -617,6 +617,15 @@
himlTT = ImageList_LoadImageW( COMDLG32_hInstance, MAKEINTRESOURCEW(38),
TTBITMAP_XSIZE, 0, CLR_DEFAULT, IMAGE_BITMAP, 0);
+ /* Set effect flags */
+ if((lpcf->Flags & CF_EFFECTS) && (lpcf->Flags &
CF_INITTOLOGFONTSTRUCT))
+ {
+ if(lpxx->lfUnderline)
+ CheckDlgButton(hDlg, chx2, TRUE);
+ if(lpxx->lfStrikeOut)
+ CheckDlgButton(hDlg, chx1, TRUE);
+ }
+
if (!(lpcf->Flags & CF_SHOWHELP) || !IsWindow(lpcf->hwndOwner))
ShowWindow(GetDlgItem(hDlg,pshHelp),SW_HIDE);
if (!(lpcf->Flags & CF_APPLY))
Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/printdlg.c (original)
+++ trunk/reactos/dll/win32/comdlg32/printdlg.c Sat Sep 15 21:06:51 2007
@@ -2059,7 +2059,10 @@
GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed);
dbuf = HeapAlloc(GetProcessHeap(),0,needed);
if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
- ERR("GetPrinterDriverA failed, le %d, fix your config for printer
%s!\n",GetLastError(),pbuf->pPrinterName);
+ ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",
+ GetLastError(),pbuf->pPrinterName);
+ HeapFree(GetProcessHeap(), 0, dbuf);
+ HeapFree(GetProcessHeap(), 0, pbuf);
COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE);
return FALSE;
}
@@ -2206,7 +2209,10 @@
GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed);
dbuf = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed);
if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
- ERR("GetPrinterDriverA failed, le %d, fix your config for printer
%s!\n",GetLastError(),debugstr_w(pbuf->pPrinterName));
+ ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",
+ GetLastError(),debugstr_w(pbuf->pPrinterName));
+ HeapFree(GetProcessHeap(), 0, dbuf);
+ HeapFree(GetProcessHeap(), 0, pbuf);
COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE);
return FALSE;
}
@@ -2615,6 +2621,8 @@
lpDriverInfo = HeapAlloc(GetProcessHeap(), 0, needed);
if(!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)lpDriverInfo, needed, &needed)) {
ERR("GetPrinterDriverA failed for %s, fix your config!\n",
lpPrinterInfo->pPrinterName);
+ HeapFree(GetProcessHeap(), 0, lpDriverInfo);
+ HeapFree(GetProcessHeap(), 0, lpPrinterInfo);
return FALSE;
}
ClosePrinter(hprn);
@@ -2622,6 +2630,8 @@
needed = DocumentPropertiesA(0, 0, name, NULL, NULL, 0);
if(needed == -1) {
ERR("DocumentProperties fails on %s\n", debugstr_a(name));
+ HeapFree(GetProcessHeap(), 0, lpDriverInfo);
+ HeapFree(GetProcessHeap(), 0, lpPrinterInfo);
return FALSE;
}
pDevMode = HeapAlloc(GetProcessHeap(), 0, needed);
@@ -3167,12 +3177,15 @@
EnableWindow(GetDlgItem(hDlg, edt7), FALSE);
}
/* Set orientation radiobutton properly */
- dm = GlobalLock(pda->dlga->hDevMode);
- if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
- CheckRadioButton(hDlg, rad1, rad2, rad2);
- else /* this is default if papersize is not set */
- CheckRadioButton(hDlg, rad1, rad2, rad1);
- GlobalUnlock(pda->dlga->hDevMode);
+ if(pda->dlga->hDevMode)
+ {
+ dm = GlobalLock(pda->dlga->hDevMode);
+ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
+ CheckRadioButton(hDlg, rad1, rad2, rad2);
+ else /* this is default if papersize is not set */
+ CheckRadioButton(hDlg, rad1, rad2, rad1);
+ GlobalUnlock(pda->dlga->hDevMode);
+ }
/* if orientation disabled */
if (pda->dlga->Flags & PSD_DISABLEORIENTATION) {
@@ -3280,13 +3293,17 @@
EnableWindow(GetDlgItem(hDlg, edt7), FALSE);
}
- dm = GlobalLock(pda->dlga->hDevMode);
- /* Landscape orientation */
- if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
- CheckRadioButton(hDlg, rad1, rad2, rad2);
- else /* this is default if papersize is not set */
- CheckRadioButton(hDlg, rad1, rad2, rad1);
- GlobalUnlock(pda->dlga->hDevMode);
+ if(pda->dlga->hDevMode)
+ {
+ dm = GlobalLock(pda->dlga->hDevMode);
+ /* Landscape orientation */
+ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
+ CheckRadioButton(hDlg, rad1, rad2, rad2);
+ else /* this is default if papersize is not set */
+ CheckRadioButton(hDlg, rad1, rad2, rad1);
+ GlobalUnlock(pda->dlga->hDevMode);
+ }
+
if (pda->dlga->Flags & PSD_DISABLEORIENTATION) {
EnableWindow(GetDlgItem(hDlg,rad1),FALSE);
EnableWindow(GetDlgItem(hDlg,rad2),FALSE);
Modified: trunk/reactos/dll/win32/comdlg32/printdlg16.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/printdlg16.c (original)
+++ trunk/reactos/dll/win32/comdlg32/printdlg16.c Sat Sep 15 21:06:51 2007
@@ -390,9 +390,10 @@
GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed);
dbuf = HeapAlloc(GetProcessHeap(),0,needed);
if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
- ERR("GetPrinterDriverA failed for %s, le %d, fix your config!\n",
- pbuf->pPrinterName,GetLastError());
- HeapFree(GetProcessHeap(), 0, dbuf);
+ ERR("GetPrinterDriverA failed for %s, le %d, fix your config!\n",
+ pbuf->pPrinterName,GetLastError());
+ HeapFree(GetProcessHeap(), 0, dbuf);
+ HeapFree(GetProcessHeap(), 0, pbuf);
COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE);
return FALSE;
}
@@ -506,7 +507,7 @@
HeapFree(GetProcessHeap(), 0, PrintStructures->lpDevMode);
HeapFree(GetProcessHeap(), 0, PrintStructures->lpPrinterInfo);
HeapFree(GetProcessHeap(), 0, PrintStructures->lpDriverInfo);
- HeapFree(GetProcessHeap(), 0, PrintStructures);
+ HeapFree(GetProcessHeap(), 0, ptr16);
}
if(bRet && (lppd->Flags & PD_RETURNDC || lppd->Flags &
PD_RETURNIC))
bRet = PRINTDLG_CreateDC16(lppd);