Re: wine/ programs/winefile/Pt.rc programs/winecfg ...

[Marcelo Duarte]

Hi,
Alexandre Julliard escreveu:
> ChangeSet ID:	16090
> CVSROOT:	/opt/cvs-commit
> Module name:	wine
> Changes by:	[e-mail]	2005/02/14 05:12:30

In this file below, the correct is "usuário", but in cvs is incorrect 
"usuário" and I dont know how to correct...
In my tree it is correct.

Index: wine/dlls/mpr/mpr_Pt.rc
diff -u -p wine/dlls/mpr/mpr_Pt.rc:1.1 wine/dlls/mpr/mpr_Pt.rc:1.2
--- wine/dlls/mpr/mpr_Pt.rc:1.1	Wed Feb 16 09:36:32 2005
+++ wine/dlls/mpr/mpr_Pt.rc	Wed Feb 16 09:36:32 2005
@@ -24,3 +24,23 @@ STRINGTABLE DISCARDABLE
 {
     IDS_ENTIRENETWORK "Toda a rede"
 }
+
+IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Entre a senha da rede"
+FONT 8, "Helv"
+{
+ LTEXT "Por favor, entre como o nome de usuário e a senha:", IDC_EXPLAIN, 40, 6, 150, 15
+

wine/ programs/winefile/Pt.rc programs/winecfg ...

[Francois Gouget]

On Wed, 16 Feb 2005, Marcelo Duarte wrote:
[...]
> +FONT 8, "Helv"

Is this correct?
I thought that we were using "MS Shell Dlg" everywhere except for 
Japanese where we use "MS UI Gothic" instead.

There does seem to be some inconsistencies. Two Japanese resource files 
use "Ms Shell Dlg" instead of "MS UI Gothic" (all the others do as 
expected):

$ egrep "^FONT" `find . -name "*.rc"` | grep "Ja.rc" | grep -v "MS UI Gothic"
./dlls/shell32/shell32_Ja.rc:FONT 10, "MS Shell Dlg"
./dlls/shell32/shell32_Ja.rc:FONT 8, "MS Shell Dlg"

And the following resource files don't use "MS Shell Dlg":

$ egrep "^FONT" `find . -name "*.rc"` | egrep -v "MS (Shell Dlg|UI Gothic)"
./dlls/mpr/mpr_De.rc:FONT 8, "Helv"
./dlls/mpr/mpr_En.rc:FONT 8, "Helv"
./dlls/mpr/mpr_Pt.rc:FONT 8, "Helv"
./dlls/mpr/mpr_Fr.rc:FONT 8, "Helv"
./dlls/shdocvw/En.rc:FONT 8, "Helv"
./dlls/shdocvw/Pt.rc:FONT 8, "Helv"
./dlls/shdocvw/De.rc:FONT 8, "Helv"
./dlls/user/resources/user32_Si.rc:FONT 8, "MS Sabs Serif"
./dlls/user/tests/resource.rc:FONT 8, "System"
./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
> - LTEXT "Por favor, entre como o nome de usuário e a senha:", IDC_EXPLAIN,

This is the same thing as "usuário" but encoded as UTF-8. I'm not sure 
we're supposed to use UTF-8 in Wine's resources so that may be a 
problem. Something must have changed the encoding on the way.

wine/ programs/winefile/Pt.rc programs/winecfg ...

[Marcelo Duarte]

Francois Gouget escreveu:
> On Wed, 16 Feb 2005, Marcelo Duarte wrote:
> [...]
> > +FONT 8, "Helv"
>
> Is this correct?

I copied the English file and only translated the strings.
> I thought that we were using "MS Shell Dlg" everywhere except for 
> Japanese where we use "MS UI Gothic" instead.

If this is the correct one, can leave that later I make a patch.
> There does seem to be some inconsistencies. Two Japanese resource 
> files use "Ms Shell Dlg" instead of "MS UI Gothic" (all the others do 
> as expected):
>
> $ egrep "^FONT" `find . -name "*.rc"` | grep "Ja.rc" | grep -v "MS UI 
> Gothic"
> ./dlls/shell32/shell32_Ja.rc:FONT 10, "MS Shell Dlg"
> ./dlls/shell32/shell32_Ja.rc:FONT 8, "MS Shell Dlg"
>
> And the following resource files don't use "MS Shell Dlg":
>
> $ egrep "^FONT" `find . -name "*.rc"` | egrep -v "MS (Shell Dlg|UI 
> Gothic)"
> ./dlls/mpr/mpr_De.rc:FONT 8, "Helv"
> ./dlls/mpr/mpr_En.rc:FONT 8, "Helv"
> ./dlls/mpr/mpr_Pt.rc:FONT 8, "Helv"
> ./dlls/mpr/mpr_Fr.rc:FONT 8, "Helv"
> ./dlls/shdocvw/En.rc:FONT 8, "Helv"
> ./dlls/shdocvw/Pt.rc:FONT 8, "Helv"
> ./dlls/shdocvw/De.rc:FONT 8, "Helv"
> ./dlls/user/resources/user32_Si.rc:FONT 8, "MS Sabs Serif"
> ./dlls/user/tests/resource.rc:FONT 8, "System"
> ./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
> ./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
> ./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
> ./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
> ./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
> ./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
> ./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
> ./programs/taskmgr/taskmgr.rc:FONT 8, "Tahoma"
> ./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/En.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
> ./programs/winecfg/Nl.rc:FONT 8, "MS Sans Serif"
> > - LTEXT "Por favor, entre como o nome de usuário e a senha:",
> >
> > IDC_EXPLAIN,
>
> This is the same thing as "usuário" but encoded as UTF-8. I'm not sure 
> we're supposed to use UTF-8 in Wine's resources so that may be a 
> problem. Something must have changed the encoding on the way.