diff --git a/programs/cmdlgtst/Pt.rc b/programs/cmdlgtst/Pt.rc
index 4bb06f4d0a4..fa53152b26a 100644
--- a/programs/cmdlgtst/Pt.rc
+++ b/programs/cmdlgtst/Pt.rc
@@ -3,7 +3,8 @@
  * Portuguese Language Support
  *
  * Copyright 2003 Marcelo Duarte
- * Copyright 2004 Américo José Melo
+ * Copyright 2004 Américo José Melo
+ * Copyright 2009 Ricardo Filipe
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,8 @@
 
 #include "cmdlgtst.h"
 
+#pragma code_page(65001)
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 CmdlgtstMenu MENU
@@ -88,7 +91,7 @@ CmdlgtstMenu MENU
   MENUITEM "&Substituir texto", CM_U_REPLACE
   MENUITEM SEPARATOR
   MENUITEM "&Imprimir", CM_U_PRINT
-  MENUITEM "Pa&ge Setup", CM_U_PAGESETUP
+  MENUITEM "Configurar Página", CM_U_PAGESETUP
  }
 
  POPUP "F&lags"
@@ -101,7 +104,7 @@ CmdlgtstMenu MENU
   MENUITEM "&Localizar/Substituir", CM_F_FINDREPLACE
   MENUITEM SEPARATOR
   MENUITEM "&Imprimir", CM_F_PRINT
-  MENUITEM "Pa&ge Setup", CM_F_PAGESETUP
+  MENUITEM "Configurar Página", CM_F_PAGESETUP
  }
 
  POPUP "Aj&uda"
@@ -117,7 +120,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 Color_Flags_Dialog DIALOG 11, 20, 207, 107
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "Flags do diálode de cores"
+CAPTION "Flags do diálode de cores"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
@@ -136,7 +139,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 Color_Flags_Dialog DIALOG 11, 20, 207, 107
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "Opções do diálogo de cores"
+CAPTION "Opções do diálogo de cores"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
@@ -156,7 +159,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 Font_Flags_Dialog DIALOG 9, 20, 207, 313
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "Flags do diálogo de fontes"
+CAPTION "Flags do diálogo de fontes"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14
@@ -191,7 +194,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 Font_Flags_Dialog DIALOG 9, 20, 207, 313
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "Opções do diálogo dos tipos de letra"
+CAPTION "Opções do diálogo dos tipos de letra"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14
@@ -228,7 +231,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 Find_Flags_Dialog DIALOG 8, 24, 207, 306
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "Flags do diálogo Localizar/Substituir"
+CAPTION "Flags do diálogo Localizar/Substituir"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14
@@ -256,14 +259,14 @@ FONT 8, "MS Shell Dlg"
  CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 168, 11, 13
  CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 180, 11, 13
  CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 24, 228, 11, 13
- CONTROL "Marcas flags que são configurados pelo sistema e devem ser limpos pelo usuário.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36
+ CONTROL "Marcas flags que são configurados pelo sistema e devem ser limpos pelo usuário.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36
 }
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 Find_Flags_Dialog DIALOG 8, 24, 207, 306
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "Opções do diálogo Localizar/Substituir"
+CAPTION "Opções do diálogo Localizar/Substituir"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14
@@ -291,7 +294,7 @@ FONT 8, "MS Shell Dlg"
  CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 168, 11, 13
  CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 180, 11, 13
  CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 24, 228, 11, 13
- CONTROL "Marcas de opções que são configuradas pelo sistema e devem ser limpos pelo utilizador.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36
+ CONTROL "Marcas de opções que são configuradas pelo sistema e devem ser limpos pelo utilizador.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36
 }
 
 
@@ -299,7 +302,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 Print_Flags_Dialog DIALOG 4, 17, 239, 287
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Flags do diálogo Imprimir/Configurar Impressão"
+CAPTION "Flags do diálogo Imprimir/Configurar Impressão"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14
@@ -333,7 +336,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 Print_Flags_Dialog DIALOG 4, 17, 239, 287
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Opções do diálogo Imprimir/Configurar Impressão"
+CAPTION "Opções do diálogo Imprimir/Configurar Impressão"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14
@@ -363,6 +366,33 @@ FONT 8, "MS Shell Dlg"
  CHECKBOX "PD_USEDEVMODECOPIES", I_PD_USEDEVMODECOPIES, 12, 264, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 }
 
+PageSetup_Flags_Dialog DIALOG 4, 17, 239, 245
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION " "
+FONT 8, "MS Shell Dlg"
+{
+ DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14
+ PUSHBUTTON "Cancelar", IDCANCEL, 180, 24, 50, 14
+ CHECKBOX "PSD_DEFAULTMINMARGINS",       I_PSD_DEFAULTMINMARGINS,       12, 12, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_DISABLEMARGINS",          I_PSD_DISABLEMARGINS,          12, 24, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_DISABLEORIENTATION",      I_PSD_DISABLEORIENTATION,      12, 36, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_DISABLEPAGEPAINTING",     I_PSD_DISABLEPAGEPAINTING,     12, 48, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_DISABLEPAPER",            I_PSD_DISABLEPAPER,            12, 60, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_DISABLEPRINTER",          I_PSD_DISABLEPRINTER,          12, 72, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_ENABLEPAGEPAINTHOOK",     I_PSD_ENABLEPAGEPAINTHOOK,     12, 84, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_ENABLEPAGESETUPHOOK",     I_PSD_ENABLEPAGESETUPHOOK,     12, 96, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATE", I_PSD_ENABLEPAGESETUPTEMPLATE, 12, 108, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATEHANDLE", I_PSD_ENABLEPAGESETUPTEMPLATEHANDLE, 12, 120, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_INHUNDREDTHSOFMILLIMETERS", I_PSD_INHUNDREDTHSOFMILLIMETERS, 12, 132, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_INTHOUSANDTHSOFINCHES",   I_PSD_INTHOUSANDTHSOFINCHES,   12, 144, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_INWININIINTLMEASURE",     I_PSD_INWININIINTLMEASURE,     12, 156, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_MARGINS",                 I_PSD_MARGINS,                 12, 168, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_MINMARGINS",              I_PSD_MINMARGINS,              12, 180, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_NONETWORKBUTTON",         I_PSD_NONETWORKBUTTON,         12, 192, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_NOWARNING",               I_PSD_NOWARNING,               12, 204, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_RETURNDEFAULT",           I_PSD_RETURNDEFAULT,           12, 216, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "PSD_SHOWHELP",                I_PSD_SHOWHELP,                12, 228, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+}
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
@@ -397,7 +427,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 File_Flags_Dialog DIALOG 6, 15, 207, 227
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Opções do Abrir/Gravar ficheiro"
+CAPTION "Opções do Abrir/Gravar ficheiro"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14
@@ -431,8 +461,8 @@ CAPTION "Sobre"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 72, 96, 50, 14
- LTEXT "Common Dialog Test Jig Exerciser, versão 1.20", -1, 13, 36, 168, 12
- LTEXT "(c) 1999-2000, Eric Williams.  Direitos garantidos pelo licença do WINE.  Don't hoard code... share it", -1, 18, 60, 157, 24
+ LTEXT "Common Dialog Test Jig Exerciser, versão 1.20", -1, 13, 36, 168, 12
+ LTEXT "(c) 1999-2000, Eric Williams.  Direitos garantidos pelo licença do WINE.  Don't hoard code... share it", -1, 18, 60, 157, 24
  ICON "AboutIcon", -1, 84, 12, 18, 20
 }
 
@@ -444,8 +474,8 @@ CAPTION "Acerca"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 72, 96, 50, 14
- LTEXT "Common Dialog Test Jig Exerciser, versão 1.20", -1, 13, 36, 168, 12
- LTEXT "(c) 1999-2000, Eric Williams.  Direitos garantidos pela licença WINE. Não guarde o código... partilhe-o", -1, 18, 60, 157, 24
+ LTEXT "Common Dialog Test Jig Exerciser, versão 1.20", -1, 13, 36, 168, 12
+ LTEXT "(c) 1999-2000, Eric Williams.  Direitos garantidos pela licença WINE. Não guarde o código... partilhe-o", -1, 18, 60, 157, 24
  ICON "AboutIcon", -1, 84, 12, 18, 20
 }
 
@@ -458,13 +488,13 @@ CAPTION "Uso"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 70, 276, 50, 14
- LTEXT "Common Dialog Test Jig Exerciser, versão 1.20", -1, 13, 48, 168, 12
+ LTEXT "Common Dialog Test Jig Exerciser, versão 1.20", -1, 13, 48, 168, 12
  LTEXT "Esta ferramenta testa COMMDLG para o Wine.", -1, 12, 72, 168, 12
- LTEXT "Flags são especificados no menu Flags.", -1, 12, 96, 168, 12
- LTEXT "Diálogo de cores muda a cor de fundo.", -1, 12, 120, 168, 12
- LTEXT "Diálogo de fontes muda todas as fontes, cores das fontes se CF_EFFECTS está selecionado.", -1, 12, 144, 168, 24
- LTEXT "O canto superior esquerdo indica o caminho completo e o título dos último sucesso de Abrir ou Salvar.", -1, 12, 180, 168, 24
- LTEXT "(c) 1999-2000, Eric Williams.  Direitos garantidos pelo licença do WINE.  Don't hoard code... share it", -1, 18, 60, 157, 24
+ LTEXT "Flags são especificados no menu Flags.", -1, 12, 96, 168, 12
+ LTEXT "Diálogo de cores muda a cor de fundo.", -1, 12, 120, 168, 12
+ LTEXT "Diálogo de fontes muda todas as fontes, cores das fontes se CF_EFFECTS está selecionado.", -1, 12, 144, 168, 24
+ LTEXT "O canto superior esquerdo indica o caminho completo e o título dos último sucesso de Abrir ou Salvar.", -1, 12, 180, 168, 24
+ LTEXT "(c) 1999-2000, Eric Williams.  Direitos garantidos pelo licença do WINE.  Don't hoard code... share it", -1, 18, 60, 157, 24
  ICON "AboutIcon", -1, 86, 12, 18, 20
  CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2
 }
@@ -477,13 +507,44 @@ CAPTION "Uso"
 FONT 8, "MS Shell Dlg"
 {
  DEFPUSHBUTTON "OK", IDOK, 70, 276, 50, 14
- LTEXT "Exercício Jig de Teste de Diálogo Comum, versão 1.20", -1, 13, 48, 168, 12
+ LTEXT "Exercício Jig de Teste de Diálogo Comum, versão 1.20", -1, 13, 48, 168, 12
  LTEXT "Esta ferramenta testa o COMMDLG para o Wine.", -1, 12, 72, 168, 12
- LTEXT "As flags são indicadas no menu Flags.", -1, 12, 96, 168, 12
- LTEXT "O diálogo de cores muda a cor de fundo.", -1, 12, 120, 168, 12
- LTEXT "O diálogo de tipos de letra muda todas as letras, cores das letras se CF_EFFECTS estiver seleccionado.", -1, 12, 144, 168, 24
- LTEXT "O canto superior esquerdo indica a localização completo e o título dos últimos sucessos de Abrir ou Gravar", -1, 12, 180, 168, 24
- LTEXT "(c) 1999-2000, Eric Williams.  Direitos garantidos pela licença WINE. Não guarde o código... partilhe-o", -1, 18, 60, 157, 24
+ LTEXT "As flags são indicadas no menu Flags.", -1, 12, 96, 168, 12
+ LTEXT "O diálogo de cores muda a cor de fundo.", -1, 12, 120, 168, 12
+ LTEXT "O diálogo de tipos de letra muda todas as letras, cores das letras se CF_EFFECTS estiver seleccionado.", -1, 12, 144, 168, 24
+ LTEXT "O canto superior esquerdo indica a localização completo e o título dos últimos sucessos de Abrir ou Gravar", -1, 12, 180, 168, 24
+ LTEXT "(c) 1999-2000, Eric Williams.  Direitos garantidos pela licença WINE. Não guarde o código... partilhe-o", -1, 18, 60, 157, 24
  ICON "AboutIcon", -1, 86, 12, 18, 20
  CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2
 }
+
+PAGESETUPDLGORD_CSTM DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "diálogo de teste TFT"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+  CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+  CONTROL "", rct3, "Static", SS_GRAYRECT,  84, 88, 80, 4
+  GROUPBOX "Papel", grp2, 8, 96, 224, 56, BS_GROUPBOX
+  LTEXT "&Tamanho:", stc2, 16, 112, 36, 8
+  COMBOBOX cmb2, 64, 110, 80, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  COMBOBOX cmb1, 150, 110, 80, 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çã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 "Margens", grp4, 80, 156, 152, 56, BS_GROUPBOX
+  LTEXT "&Esquerda:", stc15, 88, 172, 21, 8
+  EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "&Direita:", stc16, 159, 172, 27, 8
+  EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "&Cima:", stc17, 88, 192, 21, 8
+  EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "&Baixo:", stc18, 159, 192, 23, 8
+  EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
+  PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14
+  PUSHBUTTON "&Impressora...", psh3, 184, 220, 48, 14
+END