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

Frédéric Delanoy : appwiz.cpl: Fix French UI display and wording.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 0c334f597bcc7fd034367d1d0d72f798d5da2a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c334f597bcc7fd034367d1d0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 15 23:36:15 2009 +0200 appwiz.cpl: Fix French UI display and wording. --- dlls/appwiz.cpl/Fr.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index e456e46..e8e67e5 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -50,12 +50,12 @@ CAPTION "Installation/Désinstallation" FONT 8, "MS Shell Dlg" { CONTROL "Pour installer un nouveau programme à partir d'une disquette, d'un CD-ROM ou d'un disque dur, cliquez sur Installer.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 - CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 26, 70, 14 + CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 242, 26, 68, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "Les logiciels suivants peuvent être désinstallés automatiquement.\nPour supprimer un programme ou modifier ses composants, sélectionnez-le dans la liste et cliquez sur Modifier/Supprimer.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "Les logiciels suivants peuvent être désinstallés automatiquement.\nPour supprimer un programme ou modifier ses composants, sélectionnez-le dans la liste et cliquez sur Supprimer ou Modifier respectivement.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "&Informations de support...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 198, 87, 14 + CONTROL "Inf&ormations de support...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 73, 198, 95, 14 CONTROL "&Modifier...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "&Supprimer...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20

1 0

Juan Lang : winhttp: Use the correct address length when connecting.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 235c6c1e1ea959062f51909f2ae5ea402398907b URL: http://source.winehq.org/git/wine.git/?a=commit;h=235c6c1e1ea959062f51909f2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 15 13:03:19 2009 -0700 winhttp: Use the correct address length when connecting. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index edb9143..5704417 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -920,7 +920,7 @@ static BOOL open_connection( request_t *request ) heap_free( addressW ); return FALSE; } - if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, sizeof(struct sockaddr_in) )) + if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, slen )) { netconn_close( &request->netconn ); heap_free( addressW );

1 0

Juan Lang : winhttp: Fix a comment typo.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: a4a3953b2fe4e0869fb6ccf277ba0ae647852d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a3953b2fe4e0869fb6ccf27… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 15 08:40:51 2009 -0700 winhttp: Fix a comment typo. --- dlls/winhttp/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index fab6c96..e1a2b4b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -283,7 +283,7 @@ static BOOL domain_matches(LPCWSTR server, LPCWSTR domain) return ret; } -/* Matches INTERNET_MAX_USER_NAME_LENGTH in wininet.h, also RFC 1035 */ +/* Matches INTERNET_MAX_HOST_NAME_LENGTH in wininet.h, also RFC 1035 */ #define MAX_HOST_NAME_LENGTH 256 static BOOL should_bypass_proxy(session_t *session, LPCWSTR server)

1 0

Aurimas Fišeras : appwiz.cpl: Update Lithuanian translation.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: f220d1227ad4b010c7d25cd37575552b5f4aa0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f220d1227ad4b010c7d25cd37… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jul 15 18:59:04 2009 +0300 appwiz.cpl: Update Lithuanian translation. --- dlls/appwiz.cpl/Lt.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/appwiz.cpl/Lt.rc b/dlls/appwiz.cpl/Lt.rc index 7ec2a13..88f491e 100644 --- a/dlls/appwiz.cpl/Lt.rc +++ b/dlls/appwiz.cpl/Lt.rc @@ -32,7 +32,7 @@ STRINGTABLE IDS_CPL_DESC, "Leidžia įdiegti naują programinę įrangą, ar pašalinti jau įdiegtą iš jūsų kompiuterio." IDS_TAB1_TITLE, "Programos" - IDS_UNINSTALL_FAILED, "Nepavyko įvykdyti programos pašalinimo komandos '%s'. Ar norite pašalinti programos šalinimo įrašą iš registro?" + IDS_UNINSTALL_FAILED, "Nepavyko įvykdyti programos pašalinimo komandos „%s“. Ar norite pašalinti programos šalinimo įrašą iš registro?" IDS_NOT_SPECIFIED, "Nenurodyta" IDS_COLUMN_NAME, "Vardas" @@ -41,7 +41,7 @@ STRINGTABLE IDS_INSTALL_FILTER, "Diegimo programos\0*instal*.exe;*setup*.exe;*.msi\0Programos (*.exe)\0*.exe\0Visi failai (*.*)\0*.*\0\0" IDS_REMOVE, "Pa&šalinti..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "Pa&keisti/pašalinti..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -49,14 +49,14 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Įdiegti/Pašalinti" FONT 8, "MS Shell Dlg" { - CONTROL "Norėdami įdiegti naują programą iš diskelio, kompaktinio disko ar standžiojo disko spauskite 'Įdiegti'.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Norėdami įdiegti naują programą iš diskelio, kompaktinio disko ar standžiojo disko spauskite „Įdiegti“.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "Į&diegti...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "Ši programinė įranga gali būti automatiškai pašalinta. Norėdami pašalinti programą ar modifikuoti jos įdiegtus komponentus pažymėkite ją sąraše ir spauskite 'Įdiegti/Pašalinti'.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "Ši programinė įranga gali būti automatiškai pašalinta. Norėdami pašalinti programą ar modifikuoti jos įdiegtus komponentus pažymėkite ją sąraše ir spauskite „Pakeisti/pašalinti“.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Priežiūros informacija...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 84, 198, 84, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "Pa&keisti...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "Pa&šalinti...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } @@ -67,7 +67,7 @@ CAPTION "Priežiūros informacija" FONT 8, "MS Shell Dlg" { CONTROL "Gerai", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 - CONTROL "Ši informacija gali būti panaudota programos '%s' techninei priežiūrai gauti:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Ši informacija gali būti panaudota programos „%s“ techninei priežiūrai gauti:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 CONTROL "Leidėjas:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 CONTROL "Versija:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 CONTROL "Kontaktas:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8

1 0

André Hentschel : shell32: Correct German language.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 4a70164d66959f49f33f7f7bf7d9da9db9ef14ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a70164d66959f49f33f7f7bf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 15 17:45:44 2009 +0200 shell32: Correct German language. --- dlls/shell32/shell32_De.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index 47ccae2..75980ec 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -97,13 +97,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Datei" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "&Beenden", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&Ansicht" BEGIN MENUITEM "&Große Symbole", FCIDM_SHVIEW_BIGICON MENUITEM "&Kleine Symbole", FCIDM_SHVIEW_SMALLICON @@ -111,9 +111,9 @@ BEGIN MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "&Hilfe" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "&Über Systemsteuerung...", IDM_CPANEL_ABOUT END END @@ -213,7 +213,7 @@ STRINGTABLE IDS_DESKTOP "Desktop" IDS_MYCOMPUTER "Arbeitsplatz" IDS_RECYCLEBIN_FOLDER_NAME "Papierkorb" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Systemsteuerung" /* context menus */ IDS_VIEW_LARGE "&Große Symbole" @@ -283,15 +283,15 @@ STRINGTABLE IDS_NEWFOLDER "Neuer Ordner" - IDS_CPANEL_TITLE "Wine Control Panel" + IDS_CPANEL_TITLE "Wine Systemsteuerung" IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_DESCRIPTION "Beschreibung" IDS_SHLEXEC_NOASSOC "Es ist kein Programm mit diesem Dateityp verknüpft." } STRINGTABLE { -IDS_LICENSE_CAPTION, "Wine License" +IDS_LICENSE_CAPTION, "Wine Lizenz" IDS_LICENSE, "Wine ist freie Software; Sie dürfen sie unter den Bedingungen \ der GNU Lesser General Public License, welche von der \

1 0

André Hentschel : appwiz.cpl: Correct German language.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 599942643ba3fa75dec767c843dd151b1f843e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599942643ba3fa75dec767c84… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 15 17:25:14 2009 +0200 appwiz.cpl: Correct German language. --- dlls/appwiz.cpl/De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/De.rc b/dlls/appwiz.cpl/De.rc index 1111601..c851d46 100644 --- a/dlls/appwiz.cpl/De.rc +++ b/dlls/appwiz.cpl/De.rc @@ -40,7 +40,7 @@ STRINGTABLE IDS_INSTALL_FILTER, "Setup-Programme\0*instal*.exe;*setup*.exe;*.msi\0Programme (*.exe)\0*.exe\0Alle Dateien (*.*)\0*.*\0\0" IDS_REMOVE, "&Entfernen..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "Än&dern/Entfernen..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -55,7 +55,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Folgende Programme können automatisch entfernt werden. Um ein Programm zu entfernen oder um installierte Komponenten zu ändern, wählen Sie es aus der Liste aus und klicken Sie auf Ändern/Entfernen.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Informationen...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "Än&dern...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "&Entfernen...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20

1 0

Aric Stewart : sane: Remove BOM from Japanese resource.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: a3bae05dece0cbf45d918e511cf0b02640db6631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3bae05dece0cbf45d918e511… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 15 10:06:45 2009 -0500 sane: Remove BOM from Japanese resource. --- dlls/sane.ds/sane_Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/sane_Ja.rc b/dlls/sane.ds/sane_Ja.rc index dd610c6..27e7095 100644 --- a/dlls/sane.ds/sane_Ja.rc +++ b/dlls/sane.ds/sane_Ja.rc @@ -1,4 +1,4 @@ -/* +/* * Japanese resources for Twain * * Copyright 2009 CodeWeavers, Aric Stewart

1 0

Paul Vriens : transl: Merge summary.pl with checkmakefile.pl.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: tools Branch: master Commit: 42929a4dab87309bf3373a20555277dc052610e6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=42929a4dab87309bf3373a20… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Wed Jul 15 21:54:48 2009 +0200 transl: Merge summary.pl with checkmakefile.pl. --- transl/scripts/Master.sh | 1 - transl/scripts/checkmakefile.pl | 27 +++++++++++++++++++ transl/scripts/summary.pl | 54 --------------------------------------- winetest/make-winetest | 1 - 4 files changed, 27 insertions(+), 56 deletions(-) diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index 2391a28..a1e1747 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -49,7 +49,6 @@ mkdir $WORKDIR/new-langs # Analyze all the Makefiles $SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit -$SCRIPTSDIR/summary.pl "$WORKDIR" "$SCRIPTSDIR" || exit # Check for a new languages for i in $WORKDIR/new-langs/*; do diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 66c7fe5..c0294fd 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -487,3 +487,30 @@ foreach my $makefile (@makefiles) mycheck("normal", $path,$defs,@files); } } + +# create the summary file +opendir(DIR, "$scriptsdir/conf"); +my @files = grep(!/^\./, readdir(DIR)); +closedir(DIR); + +open(OUT, ">$workdir/langs/summary"); +foreach my $lang (@files) +{ + next if (!($lang eq collapse($lang))); + my $transl = 0; + my $missing = 0; + my $errors = 0; + open(FILE, "<$workdir/langs/$lang"); + while (<FILE>) + { + if (m/^FILE [A-Z]+ .* ([0-9]+) ([0-9]+) ([0-9]+)$/) { + $transl += $1; + $missing += $2; + $errors += $3; + } + } + close(FILE); + my $sum = $transl + $missing + $errors; + print OUT "LANG $lang $sum $transl $missing $errors\n"; +} +close(OUT); diff --git a/transl/scripts/summary.pl b/transl/scripts/summary.pl deleted file mode 100755 index f1290b5..0000000 --- a/transl/scripts/summary.pl +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/perl - -# Helper script - create a summary for each language about how -# many resources are translated - -die "This helper script takes two arguments" unless ($#ARGV == 1); - -$workdir = $ARGV[0]; -$scriptsdir = $ARGV[1]; - -sub collapse { - my($name) = shift @_; - $base_name = $name; - $base_name =~ s/:[0-9a-f]{2}/:00/; - if (not exists $tab_should_collapse{$name}) - { - open(NAMEFILE, "<$scriptsdir/conf/$base_name"); - $content = <NAMEFILE>; - close(NAMEFILE); - if ($content =~ /\[ignore-sublang\]/) { - $tab_should_collapse{$name} = TRUE; - } - } - - if ($tab_should_collapse{$name} eq TRUE) { - $name = $base_name; - } - return $name; -} - -opendir(DIR, "$scriptsdir/conf"); -(a)files = grep(!/^\./, readdir(DIR)); -closedir(DIR); - -open(OUT, ">$workdir/langs/summary"); -foreach $lang (@files) { - next if (!($lang eq collapse($lang))); - $transl = 0; - $missing = 0; - $errors = 0; - open(FILE, "<$workdir/langs/$lang"); - while (<FILE>) - { - if (m/^FILE [A-Z]+ .* ([0-9]+) ([0-9]+) ([0-9]+)$/) { - $transl += $1; - $missing += $2; - $errors += $3; - } - } - close(FILE); - $sum = $transl + $missing + $errors; - print OUT "LANG $lang $sum $transl $missing $errors\n"; -} -close(OUT); diff --git a/winetest/make-winetest b/winetest/make-winetest index 7394638..3b492ce 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -133,7 +133,6 @@ umask 022 rm -rf work mkdir work work/langs work/dumps work/dumps/res work/new-langs $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work -s "$toolsdir/transl/scripts" 2>>work/run.log - $toolsdir/transl/scripts/summary.pl ./work "$toolsdir/transl/scripts" for i in work/new-langs/* do if [ -f "$i" ]

1 0

Paul Vriens : transl: Merge ver.pl with checkmakefile.pl.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: tools Branch: master Commit: da9ae7279646a482a401a471a050737eda70a734 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da9ae7279646a482a401a471… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Wed Jul 15 21:44:46 2009 +0200 transl: Merge ver.pl with checkmakefile.pl. --- transl/scripts/checkmakefile.pl | 342 +++++++++++++++++++++++++++++++++++++-- transl/scripts/ver.pl | 309 ----------------------------------- 2 files changed, 327 insertions(+), 324 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=da9ae7279646a482a401…

1 0

Paul Vriens : transl: Retrieve the locale names from kernel32 instead of the conf files.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: tools Branch: master Commit: b0d8197b06d82a014e60faae4af327ade847b33a URL: http://source.winehq.org/git/tools.git/?a=commit;h=b0d8197b06d82a014e60faae… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Thu Jul 16 11:32:50 2009 +0200 transl: Retrieve the locale names from kernel32 instead of the conf files. --- transl/php/lib.php | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 3 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index 6774775..400cbf7 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -6,6 +6,60 @@ $MASTER_LANGUAGE_NAME = "English (US)"; $WINE_WIKI_TRANSLATIONS = "<a href=\"redirect.php?url=http://wiki.winehq.org/Translating\">http://wiki.winehq.org/Translating</a>"; +static $LOCALE_NAMES = array(); + +// These resources are retrieved as a sequence of words that need to be converted to a string +function convert_to_unicode($words) +{ + $unistr= ''; + + foreach ($words as $word) + $unistr .= html_entity_decode('&#'.$word.';',ENT_NOQUOTES,'UTF-8'); + + return $unistr; +} + +function res_enum($header, $f) +{ + global $LOCALE_NAMES; + + // We are only interested in a STRINGTABLE + if ($header["type"] != 6) + return FALSE; + + // Look for LOCALE_SLANGUAGE or LOCALE_SENGLANGUAGE + if ($header["name"] != 1 && $header["name"] != 257) + return FALSE; + + $data = fread($f, $header["resSize"]); + $str = new StringTable($header, $data, 0); + $langid = sprintf("%03x:%02x", $header["language"] & 0x3ff, $header["language"] >> 10); + + if ($header["name"] == 1) + { + $LOCALE_NAMES[$langid] = convert_to_unicode($str->getString(2)); + } + else if ($header["name"] == 257) + { + $baseid = get_lang_base($langid); + $LOCALE_NAMES[$baseid] = convert_to_unicode($str->getString(1)); + } +} + +function enum_locale_names() +{ + include_once "lib_res.php"; + global $LOCALE_NAMES; + + if (!empty($LOCALE_NAMES)) + { + return; + } + $res = new ResFile("dumps/res/dlls-kernel32.res"); + $res->enumResources("res_enum"); + ksort($LOCALE_NAMES); +} + function validate_lang($id) { global $DATAROOT; @@ -52,7 +106,7 @@ function get_raw_lang_name($id) function get_lang_name($id) { - return preg_replace("/\[[A-za-z0-9-]+\]/", "", get_raw_lang_name($id)); + return get_locale_name($id); } function get_lang_base($id) @@ -65,7 +119,7 @@ function get_sublangs($id) if (preg_match("/:00/", $id)) { global $LOCALE_NAMES; - include_once("dump_locales.php"); + enum_locale_names(); $base = preg_replace("/:00/", "", $id); $sublangs = array(); @@ -120,7 +174,7 @@ function get_lang_binid($lang) function get_locale_name($localeid) { global $LOCALE_NAMES; - include_once("dump_locales.php"); + enum_locale_names(); return $LOCALE_NAMES[$localeid]; }

1 0