July 2009 - Wine-Commits - list.winehq.org

Frédéric Delanoy : shdoclc: Fix French translation & UI display.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 7d7c64abdd0daaa1c790f460fd46bd2d33d124ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7c64abdd0daaa1c790f460f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 17:05:52 2009 +0200 shdoclc: Fix French translation & UI display. --- dlls/shdoclc/Fr.rc | 157 ++++++++++++++++++++++++++------------------------- 1 files changed, 80 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d7c64abdd0daaa1c790f…

1 0

Alexandre Julliard : ntdll: Add support for the MEM_RESET flag in VirtualAlloc, with tests.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: df6c65623a606d04ba71eb1fceeaa88399255faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6c65623a606d04ba71eb1fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 19:17:49 2009 +0200 ntdll: Add support for the MEM_RESET flag in VirtualAlloc, with tests. --- dlls/kernel32/tests/virtual.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/virtual.c | 7 ++++++- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index e665f0f..b7e97db 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -284,6 +284,40 @@ static void test_VirtualAlloc(void) ok(old_prot == PAGE_READONLY, "wrong old protection: got %04x instead of PAGE_READONLY\n", old_prot); + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), + "VirtualQuery failed\n"); + ok(info.RegionSize == 0x1000, "%lx != 0x1000\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "%x != MEM_COMMIT\n", info.State); + ok(info.Protect == PAGE_READWRITE, "%x != PAGE_READWRITE\n", info.Protect); + memset( addr1, 0x55, 20 ); + ok( *(DWORD *)addr1 == 0x55555555, "wrong data %x\n", *(DWORD *)addr1 ); + + addr2 = VirtualAlloc( addr1, 0x1000, MEM_RESET, PAGE_NOACCESS ); + ok( addr2 == addr1 || broken( !addr2 && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */ + "VirtualAlloc failed err %u\n", GetLastError() ); + ok( *(DWORD *)addr1 == 0x55555555 || *(DWORD *)addr1 == 0, "wrong data %x\n", *(DWORD *)addr1 ); + if (addr2) + { + ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info), + "VirtualQuery failed\n"); + ok(info.RegionSize == 0x1000, "%lx != 0x1000\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "%x != MEM_COMMIT\n", info.State); + ok(info.Protect == PAGE_READWRITE, "%x != PAGE_READWRITE\n", info.Protect); + + addr2 = VirtualAlloc( (char *)addr1 + 0x1000, 0x1000, MEM_RESET, PAGE_NOACCESS ); + ok( (char *)addr2 == (char *)addr1 + 0x1000, "VirtualAlloc failed\n" ); + + ok(VirtualQuery(addr2, &info, sizeof(info)) == sizeof(info), + "VirtualQuery failed\n"); + ok(info.RegionSize == 0xf000, "%lx != 0xf000\n", info.RegionSize); + ok(info.State == MEM_RESERVE, "%x != MEM_RESERVE\n", info.State); + ok(info.Protect == 0, "%x != 0\n", info.Protect); + + addr2 = VirtualAlloc( (char *)addr1 + 0xf000, 0x2000, MEM_RESET, PAGE_NOACCESS ); + ok( !addr2, "VirtualAlloc failed\n" ); + ok( GetLastError() == ERROR_INVALID_ADDRESS, "wrong error %u\n", GetLastError() ); + } + /* invalid protection values */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(NULL, 0x1000, MEM_RESERVE, 0); @@ -329,7 +363,7 @@ static void test_MapViewOfFile(void) static const char testfile[] = "testfile.xxx"; const char *name; HANDLE file, mapping, map2; - void *ptr, *ptr2; + void *ptr, *ptr2, *addr; MEMORY_BASIC_INFORMATION info; BOOL ret; @@ -700,6 +734,10 @@ static void test_MapViewOfFile(void) ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); } + addr = VirtualAlloc( ptr, MAPPING_SIZE, MEM_RESET, PAGE_READONLY ); + ok( addr == ptr || broken(!addr && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */ + "VirtualAlloc failed with error %u\n", GetLastError() ); + ret = VirtualFree( ptr, 0x10000, MEM_DECOMMIT ); ok( !ret || broken(ret) /* win9x */, "VirtualFree succeeded\n" ); if (!ret) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 32e7d93..04c90f6 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1787,7 +1787,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ /* Compute the alloc type flags */ - if (!(type & (MEM_COMMIT | MEM_RESERVE)) || + if (!(type & (MEM_COMMIT | MEM_RESERVE | MEM_RESET)) || (type & ~(MEM_COMMIT | MEM_RESERVE | MEM_TOP_DOWN | MEM_WRITE_WATCH | MEM_RESET))) { WARN("called with wrong alloc type flags (%08x) !\n", type); @@ -1804,6 +1804,11 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG zero_ status = map_view( &view, base, size, mask, type & MEM_TOP_DOWN, vprot ); if (status == STATUS_SUCCESS) base = view->base; } + else if (type & MEM_RESET) + { + if (!(view = VIRTUAL_FindView( base, size ))) status = STATUS_NOT_MAPPED_VIEW; + else madvise( base, size, MADV_DONTNEED ); + } else /* commit the pages */ { if (!(view = VIRTUAL_FindView( base, size ))) status = STATUS_NOT_MAPPED_VIEW;

1 0

Frédéric Delanoy : view: Convert French resources to UTF-8.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 384f811f063168091946e73aa33e65e7ae7797c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=384f811f063168091946e73aa… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 22:40:33 2009 +0200 view: Convert French resources to UTF-8. --- programs/view/Fr.rc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/view/Fr.rc b/programs/view/Fr.rc index 786a63d..bcbb0ca 100644 --- a/programs/view/Fr.rc +++ b/programs/view/Fr.rc @@ -4,7 +4,7 @@ * * Copyright 1998 Douglas Ridgway * Copyright 2003 Marcelo Duarte - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,6 +23,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL /* @@ -38,9 +41,9 @@ BEGIN MENUITEM "&Ouvrir", IDM_OPEN MENUITEM "&Quitter", IDM_EXIT END - POPUP "&D�placement" + POPUP "&Déplacement" BEGIN - MENUITEM "&Mettre � l'�chelle", IDM_SET_EXT_TO_WIN + MENUITEM "&Mettre à l'échelle", IDM_SET_EXT_TO_WIN MENUITEM SEPARATOR MENUITEM "&Gauche", IDM_LEFT MENUITEM "&Droite", IDM_RIGHT @@ -70,5 +73,5 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Visionneuse de fichiers Metafile r�guliers" + IDS_DESCRIPTION "Visionneuse de fichiers Metafile réguliers" END

1 0

Frédéric Delanoy : msvidc32: Convert French resources to UTF-8.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 88da8071f008ea9b329c46d7e61bbe0020a9a907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88da8071f008ea9b329c46d7e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 18:42:03 2009 +0200 msvidc32: Convert French resources to UTF-8. --- dlls/msvidc32/msvidc32_Fr.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msvidc32/msvidc32_Fr.rc b/dlls/msvidc32/msvidc32_Fr.rc index b250deb..8843e0d 100644 --- a/dlls/msvidc32/msvidc32_Fr.rc +++ b/dlls/msvidc32/msvidc32_Fr.rc @@ -18,10 +18,13 @@ #include "msvidc32_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_NAME "MS-CRAM" - IDS_DESCRIPTION "codec vid�o Wine Video 1" + IDS_DESCRIPTION "Codec vidéo Wine Video 1" }

1 0

Alexandre Julliard : kernel32: Explicitly specify the codepage in message files.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: d69b6d89a57891e9d6aea4612039647402fab5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69b6d89a57891e9d6aea4612… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 20:39:23 2009 +0200 kernel32: Explicitly specify the codepage in message files. --- dlls/kernel32/nls/winerr_deu.mc | 1 + dlls/kernel32/nls/winerr_fra.mc | 1 + dlls/kernel32/nls/winerr_kor.mc | 1 + dlls/kernel32/nls/winerr_nld.mc | 1 + dlls/kernel32/nls/winerr_nor.mc | 1 + dlls/kernel32/nls/winerr_plk.mc | 1 + 6 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/nls/winerr_deu.mc b/dlls/kernel32/nls/winerr_deu.mc index 6c240aa..efb25f9 100644 --- a/dlls/kernel32/nls/winerr_deu.mc +++ b/dlls/kernel32/nls/winerr_deu.mc @@ -17,6 +17,7 @@ ; LanguageNames=(DEU=0x0007:winerr) +CodePages=(DEU=1252:0) MessageId=0 SymbolicName=ERROR_SUCCESS diff --git a/dlls/kernel32/nls/winerr_fra.mc b/dlls/kernel32/nls/winerr_fra.mc index 510c3ed..164e9b1 100644 --- a/dlls/kernel32/nls/winerr_fra.mc +++ b/dlls/kernel32/nls/winerr_fra.mc @@ -17,6 +17,7 @@ ; LanguageNames=(FRA=0x0c:winerr) +CodePages=(FRA=1252:0) MessageId=0 SymbolicName=ERROR_SUCCESS diff --git a/dlls/kernel32/nls/winerr_kor.mc b/dlls/kernel32/nls/winerr_kor.mc index b4cdc58..95082e4 100644 --- a/dlls/kernel32/nls/winerr_kor.mc +++ b/dlls/kernel32/nls/winerr_kor.mc @@ -18,6 +18,7 @@ ; LanguageNames=(KOR=0x412:winerr) +CodePages=(KOR=949:0) MessageId=0 SymbolicName=ERROR_SUCCESS diff --git a/dlls/kernel32/nls/winerr_nld.mc b/dlls/kernel32/nls/winerr_nld.mc index b3c7dac..5682c2b 100644 --- a/dlls/kernel32/nls/winerr_nld.mc +++ b/dlls/kernel32/nls/winerr_nld.mc @@ -17,6 +17,7 @@ ; LanguageNames=(NLD=0x0013:winerr) +CodePages=(NLD=1252:0) MessageId=0 SymbolicName=ERROR_SUCCESS diff --git a/dlls/kernel32/nls/winerr_nor.mc b/dlls/kernel32/nls/winerr_nor.mc index 497a14d..0afa520 100644 --- a/dlls/kernel32/nls/winerr_nor.mc +++ b/dlls/kernel32/nls/winerr_nor.mc @@ -18,6 +18,7 @@ ; LanguageNames=(NOR=0x414:winerr) +CodePages=(NOR=1252:0) MessageId=0 SymbolicName=ERROR_SUCCESS diff --git a/dlls/kernel32/nls/winerr_plk.mc b/dlls/kernel32/nls/winerr_plk.mc index 1e5dec3..cb1517b 100644 --- a/dlls/kernel32/nls/winerr_plk.mc +++ b/dlls/kernel32/nls/winerr_plk.mc @@ -17,6 +17,7 @@ ; LanguageNames=(PLK=0x0015:winerr) +CodePages=(PLK=1250:0) MessageId=0 SymbolicName=ERROR_SUCCESS

1 0

Frédéric Delanoy : msvfw32: Fix French UI display .
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: a20e68299563377bda8a6328af229b7a1df35893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20e68299563377bda8a6328a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 18:23:19 2009 +0200 msvfw32: Fix French UI display. --- dlls/msvfw32/msvfw32_Fr.rc | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Fr.rc b/dlls/msvfw32/msvfw32_Fr.rc index cd2c056..87d61cc 100644 --- a/dlls/msvfw32/msvfw32_Fr.rc +++ b/dlls/msvfw32/msvfw32_Fr.rc @@ -18,36 +18,39 @@ #include "msvideo_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 208, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Compression vid�o" +CAPTION "Compression vidéo" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "OK",IDOK,129,2,49,14 - PUSHBUTTON "Annuler",IDCANCEL,129,18,49,14 + DEFPUSHBUTTON "OK",IDOK,150,2,49,14 + PUSHBUTTON "Annuler",IDCANCEL,150,18,49,14 - LTEXT "&Compresseur�:",-1,9,6,105,8 - COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + LTEXT "&Compresseur :",-1,9,6,131,8 + COMBOBOX 880,9,16,135,15,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP - PUSHBUTTON "Con&figurer...",882,129,36,49,14 - PUSHBUTTON "� &propos",883,129,52,49,14 + PUSHBUTTON "Con&figurer...",882,150,36,49,14 + PUSHBUTTON "À &propos",883,150,52,49,14 - SCROLLBAR 884,9,44,111,9,WS_TABSTOP + SCROLLBAR 884,9,44,133,9,WS_TABSTOP - LTEXT "&Qualit� de compression�:",886,9,34,80,8 + LTEXT "&Qualité de compression :",886,9,34,131,8 - CONTROL "Image &cl� toutes les",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 - EDITTEXT 888,78,60,22,12 - LTEXT "images",889,103,62,26,10 + CONTROL "Image &clé toutes les",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,77,12 + EDITTEXT 888,89,60,22,12 + LTEXT "images",889,115,63,26,10 - CONTROL "&D�bit de donn�es",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 - EDITTEXT 895,78,76,22,12 - LTEXT "Kio/sec",896,102,78,26,10 + CONTROL "&Débit de données",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,77,12 + EDITTEXT 895,89,76,22,12 + LTEXT "Kio/sec",896,115,78,26,10 } STRINGTABLE DISCARDABLE { - IDS_FULLFRAMES "Images compl�tes (non compress�es)" + IDS_FULLFRAMES "Images complètes (non compressées)" }

1 0

Frédéric Delanoy : comdlg32: Fix left-right margins inversion in French page setup UI.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 37dba9f2d925ee21507109fb4d2b76b124e47158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37dba9f2d925ee21507109fb4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 23:56:55 2009 +0200 comdlg32: Fix left-right margins inversion in French page setup UI. --- dlls/comdlg32/cdlg_Fr.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/cdlg_Fr.rc b/dlls/comdlg32/cdlg_Fr.rc index 88de746..de87186 100644 --- a/dlls/comdlg32/cdlg_Fr.rc +++ b/dlls/comdlg32/cdlg_Fr.rc @@ -323,13 +323,13 @@ BEGIN AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "Pa&ysage", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Marges", grp4, 80, 156, 156, 56, BS_GROUPBOX - LTEXT "&Droite :", stc15, 88, 172, 25, 8 - EDITTEXT edt4, 114, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "&Gauche :", stc16, 159, 172, 27, 8 + LTEXT "&Gauche :", stc15, 88, 172, 29, 8 + EDITTEXT edt4, 119, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Droite :", stc16, 163, 172, 27, 8 EDITTEXT edt6, 190, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Haut :", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 114, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "&Bas :", stc18, 159, 192, 23, 8 + EDITTEXT edt5, 119, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Bas :", stc18, 163, 192, 23, 8 EDITTEXT edt7, 190, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 70, 220, 51, 14, BS_PUSHBUTTON PUSHBUTTON "Annuler", IDCANCEL, 125, 220, 51, 14

1 0

Frédéric Delanoy : comdlgtst: Fix French translation & UI display.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 2400313cb6d0c28fc9a79517bea6a0b700fdf185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2400313cb6d0c28fc9a79517b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 00:42:53 2009 +0200 comdlgtst: Fix French translation & UI display. --- programs/cmdlgtst/Fr.rc | 63 ++++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 30 deletions(-) diff --git a/programs/cmdlgtst/Fr.rc b/programs/cmdlgtst/Fr.rc index e782424..c1a11e9 100644 --- a/programs/cmdlgtst/Fr.rc +++ b/programs/cmdlgtst/Fr.rc @@ -3,8 +3,8 @@ * French Language Support * * Copyright (c) 1999 Eric Williams. - * Copyright (c) 2003 Vincent B�ron. - * Copyright (c) 2006 Jonathan�Ernst. + * Copyright (c) 2003 Vincent Béron. + * Copyright (c) 2006 Jonathan Ernst. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,6 +23,9 @@ #include "cmdlgtst.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL CmdlgtstMenu MENU @@ -47,7 +50,7 @@ CmdlgtstMenu MENU MENUITEM "Mise en pa&ge", CM_U_PAGESETUP } - POPUP "&Drapeaux" + POPUP "&Indicateurs" { MENUITEM "&Fichier", CM_F_FILE MENUITEM SEPARATOR @@ -63,14 +66,14 @@ CmdlgtstMenu MENU POPUP "&Aide" { MENUITEM "&Usage", CM_H_USAGE - MENUITEM "� &propos", CM_H_ABOUT + MENUITEM "À &propos", CM_H_ABOUT } } Color_Flags_Dialog DIALOG 11, 20, 207, 107 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Drapeaux de la bo�te de dialogue de choix de la couleur" +CAPTION "Indicateurs de la boîte de dialogue de choix de la couleur" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -87,7 +90,7 @@ FONT 8, "MS Shell Dlg" Font_Flags_Dialog DIALOG 9, 20, 207, 313 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Drapeaux de la bo�te de dialogue de choix de la police" +CAPTION "Indicateurs de la boîte de dialogue de choix de la police" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14 @@ -121,7 +124,7 @@ FONT 8, "MS Shell Dlg" Find_Flags_Dialog DIALOG 8, 24, 207, 306 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Drapeaux de la fen�tre de recherche/remplacement" +CAPTION "Indicateurs de la fenêtre de recherche/remplacement" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14 @@ -149,12 +152,12 @@ 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 "Indique les drapeaux qui sont fournis par le syst�me et qui doivent �tre effac�s par l'utilisateur.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 + CONTROL "Signale les indicateurs qui sont définis par le système et doivent être explicitement effacés par l'utilisateur.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 } Print_Flags_Dialog DIALOG 4, 17, 239, 287 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Drapeaux de la bo�te de dialogue d'impression" +CAPTION "Indicateurs de la boîte de dialogue d'impression" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14 @@ -214,7 +217,7 @@ FONT 8, "MS Shell Dlg" File_Flags_Dialog DIALOG 6, 15, 207, 227 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Drapeaux de la bo�te de dialogue d'ouverture et d'enregistrement de fichier" +CAPTION "Indicateurs de la boîte de dialogue d'ouverture et d'enregistrement de fichier" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14 @@ -241,12 +244,12 @@ FONT 8, "MS Shell Dlg" AboutDialog DIALOG 6, 15, 194, 119 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "� propos" +CAPTION "À propos" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 72, 96, 50, 14 - LTEXT "Test des bo�tes de dialogue standard, version 1.20", -1, 13, 36, 168, 12 - LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le�!", -1, 18, 60, 157, 24 + LTEXT "Test des boîtes de dialogue standard, version 1.20", -1, 13, 36, 168, 12 + LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accordés par la licence de Wine. N'accumulez pas du code tout seul... partagez-le !", -1, 18, 60, 157, 24 ICON "AboutIcon", -1, 84, 12, 18, 20 } @@ -256,43 +259,43 @@ CAPTION "Usage" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 70, 276, 50, 14 - LTEXT "Test des bo�tes de dialogue standard, version 1.20", -1, 13, 48, 168, 12 + LTEXT "Test des boîtes de dialogue standard, version 1.20", -1, 13, 48, 168, 12 LTEXT "Cet outil teste COMMDLG pour Wine.", -1, 12, 72, 168, 12 - LTEXT "Drapeaux sp�cifi�s dans le menu Drapeaux.", -1, 12, 96, 168, 12 - LTEXT "La bo�te de dialogue de choix de la couleur change la couleur de l'arri�re-plan.", -1, 12, 114, 168, 18 - LTEXT "La bo�te de dialogue de choix de la police change toutes les polices, et la couleur de la police si CF_EFFECTS est s�lectionn�.", -1, 12, 144, 168, 24 - LTEXT "Le nom complet et le titre de la derni�re op�ration r�ussie d'ouverture ou d'enregistrement se trouvent dans le coin en haut � gauche.", -1, 12, 180, 168, 24 - LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le�!", -1, 12, 228, 168, 36 + LTEXT "Indicateurs spécifiés dans le menu Indicateurs.", -1, 12, 96, 168, 12 + LTEXT "La boîte de dialogue de choix de la couleur permet de modifier la couleur de l'arrière-plan.", -1, 12, 114, 168, 18 + LTEXT "La boîte de dialogue de choix de la police permet de sélectionner toutes les polices, et couleurs de police si CF_EFFECTS est sélectionné.", -1, 12, 144, 168, 24 + LTEXT "Le nom complet et le titre de la dernière opération réussie d'ouverture ou d'enregistrement se trouvent dans le coin en haut à gauche.", -1, 12, 180, 168, 24 + LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accordés par la licence de Wine. N'accumulez pas du code tout seul... partagez-le !", -1, 12, 228, 168, 36 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 "Bo�te de dialogue de test TFT" +CAPTION "Boîte de dialogue de test 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 "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "&Taille�:", stc2, 16, 112, 36, 8 + LTEXT "&Taille :", 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 "Ba&c�:", stc3, 16, 132, 36, 8 + LTEXT "Ba&c :", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "Pa&ysage", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Bordures", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "&Gauche�:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "&Droite�:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "&Haut�:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "&Bas�:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Gauche :", stc15, 88, 172, 29, 8 + EDITTEXT edt4, 119, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Droite :", stc16, 163, 172, 27, 8 + EDITTEXT edt6, 190, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Haut :", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 119, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Bas :", stc18, 163, 192, 23, 8 + EDITTEXT edt7, 190, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Annuler", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "&Imprimante...", psh3, 184, 220, 48, 14

1 0

Frédéric Delanoy : winemine: Fix French translation & UI display.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: e4b0d328cacd72d489081f71f26cd56d1fe2b062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4b0d328cacd72d489081f71f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 22:34:35 2009 +0200 winemine: Fix French translation & UI display. --- programs/winemine/Fr.rc | 47 +++++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/programs/winemine/Fr.rc b/programs/winemine/Fr.rc index fa7d5ec..6ab5b23 100644 --- a/programs/winemine/Fr.rc +++ b/programs/winemine/Fr.rc @@ -4,8 +4,8 @@ * * Copyright 2000 Joshua Thielen * Copyright 2003 Marcelo Duarte - * Copyright 2003 Vincent B�ron - * Copyright 2006 Jonathan�Ernst + * Copyright 2003 Vincent Béron + * Copyright 2006 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,10 +24,13 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { - IDS_APPNAME, "D�mineur Wine" + IDS_APPNAME, "Démineur de Wine" IDS_NOBODY, "Anonyme" IDS_ABOUT, "Copyright 2000 Joshua Thielen" } @@ -37,29 +40,29 @@ MENU_WINEMINE MENU DISCARDABLE POPUP "&Options" { MENUITEM "&Nouveau\tF2", IDM_NEW MENUITEM SEPARATOR - MENUITEM "Points d'interro&gation", IDM_MARKQ + MENUITEM "&Marquage des cases suspectes", IDM_MARKQ MENUITEM SEPARATOR - MENUITEM "&D�butant", IDM_BEGINNER - MENUITEM "&Avanc�", IDM_ADVANCED + MENUITEM "&Débutant", IDM_BEGINNER + MENUITEM "&Avancé", IDM_ADVANCED MENUITEM "&Expert", IDM_EXPERT - MENUITEM "&Personnalis�...", IDM_CUSTOM + MENUITEM "&Personnalisé...", IDM_CUSTOM MENUITEM SEPARATOR MENUITEM "&Quitter\tAlt+X", IDM_EXIT } POPUP "&Info" { - MENUITEM "&Temps les plus rapides", IDM_TIMES - MENUITEM "� &propos", IDM_ABOUT + MENUITEM "Meilleurs &temps", IDM_TIMES + MENUITEM "À &propos", IDM_ABOUT } } DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Temps les plus rapides" +CAPTION "Meilleurs temps" { - GROUPBOX "Temps les plus rapides", -1, 10, 10, 140, 45 - LTEXT "D�butant", -1, 20, 20, 40, 8 - LTEXT "Avanc�", -1, 20, 30, 40, 8 + GROUPBOX "Meilleurs temps", -1, 10, 10, 140, 45 + LTEXT "Débutant", -1, 20, 20, 40, 8 + LTEXT "Avancé", -1, 20, 30, 40, 8 LTEXT "Expert", -1, 20, 40, 40, 8 LTEXT "999", IDC_TIME1, 70, 20, 15, 8 LTEXT "999", IDC_TIME2, 70, 30, 15, 8 @@ -73,9 +76,9 @@ CAPTION "Temps les plus rapides" DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "F�licitations�!" +CAPTION "Félicitations !" { - LTEXT "Veuillez saisir votre nom", -1, 10, 10, 150, 10 + LTEXT "Veuillez saisir votre nom :", -1, 25, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 } @@ -83,14 +86,14 @@ CAPTION "F DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Grille personnalis�e" +CAPTION "Grille personnalisée" { - LTEXT "Rang�es", -1, 5, 5, 30, 10 + LTEXT "Lignes", -1, 5, 5, 30, 10 LTEXT "Colonnes", -1, 5, 35, 30, 10 LTEXT "Mines", -1, 5, 65, 30, 10 - EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Annuler", IDCANCEL, 40, 50, 50, 15 + EDITTEXT IDC_EDITROWS, 5, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 30, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 44, 30, 50, 15 + PUSHBUTTON "Annuler", IDCANCEL, 44, 50, 50, 15 }

1 0

Frédéric Delanoy : progman: Fix French translation & UI display.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 08034737846bade850d9ea4615932d3ddb13da38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08034737846bade850d9ea461… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 19:32:38 2009 +0200 progman: Fix French translation & UI display. --- programs/progman/Fr.rc | 145 ++++++++++++++++++++++++----------------------- 1 files changed, 74 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08034737846bade850d9e…

1 0