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

Frédéric Delanoy : jscript: Add French translation.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: a2e5c0b7b22c42636444c6d105e0cf90cdebad72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e5c0b7b22c42636444c6d10… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 21 17:15:59 2009 +0200 jscript: Add French translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Fr.rc | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index c76bed0..aaaf0f9 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = oleaut32 user32 advapi32 kernel32 RC_SRCS = \ jscript_En.rc \ + jscript_Fr.rc \ rsrc.rc C_SRCS = \ diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc new file mode 100644 index 0000000..04d19ed --- /dev/null +++ b/dlls/jscript/jscript_Fr.rc @@ -0,0 +1,37 @@ +/* + * French resources for jscript + * + * Copyright 2009 Frédéric Delanoy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_INVALID_CALL_ARG "Appel de procédure ou argument invalide" + IDS_NO_PROPERTY "Cet objet ne supporte pas cette propriété ou méthode" + IDS_ARG_NOT_OPT "Argument non optionnel" + IDS_NOT_DATE "« [objet] » n'est pas un objet de type date" + IDS_NOT_NUM "Nombre attendu" + IDS_NOT_BOOL "Booléen attendu" + IDS_INVALID_LENGTH "La longueur d'un tableau doit être un entier positif" +}

1 0

Vincent Beers : winecfg: Fixed Dutch translation.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: faa2efc8cedb5154824b172f332c0f35a57a5123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa2efc8cedb5154824b172f3… Author: Vincent Beers <vincentbeers(a)gmail.com> Date: Mon Jul 20 19:21:28 2009 +0200 winecfg: Fixed Dutch translation. --- programs/winecfg/Nl.rc | 81 ++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=faa2efc8cedb5154824b1…

1 0

Alexandre Julliard : mountmgr: Create volumes for non-removable volumes reported by HAL/Disk Arbitration.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 19e2d0cd5d244569827b8604f42dc031a6f4409a URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e2d0cd5d244569827b8604f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 20:33:17 2009 +0200 mountmgr: Create volumes for non-removable volumes reported by HAL/Disk Arbitration. --- dlls/mountmgr.sys/diskarb.c | 20 ++++++++++---------- dlls/mountmgr.sys/hal.c | 15 ++++++++------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 2e5c121..0c188ff 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -47,10 +47,6 @@ static void appeared_callback( DADiskRef disk, void *context ) if (!dict) return; - /* ignore non-removable devices */ - if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) || - !CFBooleanGetValue( ref )) goto done; - if ((ref = CFDictionaryGetValue( dict, CFSTR("DAVolumeUUID") ))) { CFUUIDBytes bytes = CFUUIDGetUUIDBytes( ref ); @@ -78,7 +74,11 @@ static void appeared_callback( DADiskRef disk, void *context ) TRACE( "got mount notification for '%s' on '%s' uuid %s\n", device, mount_point, wine_dbgstr_guid(guid_ptr) ); - add_dos_device( -1, device, device, mount_point, type, guid_ptr ); + if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) && CFBooleanGetValue( ref )) + add_dos_device( -1, device, device, mount_point, type, guid_ptr ); + else + if (guid_ptr) add_volume( device, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); + done: CFRelease( dict ); } @@ -96,10 +96,6 @@ static void disappeared_callback( DADiskRef disk, void *context ) if (!dict) return; - /* ignore non-removable devices */ - if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) || - !CFBooleanGetValue( ref )) goto done; - /* get device name */ if (!(ref = CFDictionaryGetValue( dict, CFSTR("DAMediaBSDName") ))) goto done; strcpy( device, "/dev/r" ); @@ -107,7 +103,11 @@ static void disappeared_callback( DADiskRef disk, void *context ) TRACE( "got unmount notification for '%s'\n", device ); - remove_dos_device( -1, device ); + if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaRemovable") )) && CFBooleanGetValue( ref )) + remove_dos_device( -1, device ); + else + remove_volume( device ); + done: CFRelease( dict ); } diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index 5ccb95d..82a70e9 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -156,9 +156,6 @@ static void new_device( LibHalContext *ctx, const char *udi ) if (!(parent = p_libhal_device_get_property_string( ctx, udi, "info.parent", &error ))) goto done; - if (!p_libhal_device_get_property_bool( ctx, parent, "storage.removable", &error )) - goto done; - if (!(uuid_str = p_libhal_device_get_property_string( ctx, udi, "volume.uuid", &error ))) p_dbus_error_free( &error ); /* ignore error */ else @@ -171,10 +168,13 @@ static void new_device( LibHalContext *ctx, const char *udi ) else if (type && !strcmp( type, "floppy" )) drive_type = DEVICE_FLOPPY; else drive_type = DEVICE_UNKNOWN; - add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); - - /* add property watch for mount point */ - p_libhal_device_add_property_watch( ctx, udi, &error ); + if (p_libhal_device_get_property_bool( ctx, parent, "storage.removable", &error )) + { + add_dos_device( -1, udi, device, mount_point, drive_type, guid_ptr ); + /* add property watch for mount point */ + p_libhal_device_add_property_watch( ctx, udi, &error ); + } + else if (guid_ptr) add_volume( udi, device, mount_point, DEVICE_HARDDISK_VOL, guid_ptr ); done: if (type) p_libhal_free_string( type ); @@ -198,6 +198,7 @@ static void removed_device( LibHalContext *ctx, const char *udi ) p_libhal_device_remove_property_watch( ctx, udi, &error ); p_dbus_error_free( &error ); } + else remove_volume( udi ); } /* HAL callback for property changes */

1 0

Alexandre Julliard : mountmgr: Add support for creating volumes without an associated drive.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 22f58341dc2a46cd8380c7e7cd797b81d608a6f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f58341dc2a46cd8380c7e7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 20:30:43 2009 +0200 mountmgr: Add support for creating volumes without an associated drive. --- dlls/mountmgr.sys/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++ dlls/mountmgr.sys/mountmgr.h | 3 + 2 files changed, 94 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 56c6446..efbbb33 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -84,6 +84,7 @@ struct dos_drive }; static struct list drives_list = LIST_INIT(drives_list); +static struct list volumes_list = LIST_INIT(volumes_list); static DRIVER_OBJECT *harddisk_driver; @@ -300,6 +301,7 @@ static NTSTATUS create_volume( const char *udi, enum device_type type, struct vo } if (!(status = create_disk_device( type, &volume->device ))) { + list_add_tail( &volumes_list, &volume->entry ); *volume_ret = volume; } else @@ -313,6 +315,7 @@ static NTSTATUS create_volume( const char *udi, enum device_type type, struct vo /* delete a volume and the corresponding disk device */ static void delete_volume( struct volume *volume ) { + list_remove( &volume->entry ); if (volume->mount) delete_mount_point( volume->mount ); delete_disk_device( volume->device ); RtlFreeHeap( GetProcessHeap(), 0, volume->udi ); @@ -348,6 +351,60 @@ static void delete_dos_device( struct dos_drive *drive ) RtlFreeHeap( GetProcessHeap(), 0, drive ); } +/* change the information for an existing volume */ +static NTSTATUS set_volume_info( struct volume *volume, const char *device, const char *mount_point, + enum device_type type, const GUID *guid ) +{ + struct disk_device *disk_device = volume->device; + NTSTATUS status; + + if (type != disk_device->type) + { + if ((status = create_disk_device( type, &disk_device ))) return status; + if (volume->mount) + { + delete_mount_point( volume->mount ); + volume->mount = NULL; + } + delete_disk_device( volume->device ); + volume->device = disk_device; + } + else + { + RtlFreeHeap( GetProcessHeap(), 0, disk_device->unix_device ); + RtlFreeHeap( GetProcessHeap(), 0, disk_device->unix_mount ); + } + disk_device->unix_device = strdupA( device ); + disk_device->unix_mount = strdupA( mount_point ); + + if (memcmp( &volume->guid, guid, sizeof(volume->guid) )) + { + volume->guid = *guid; + if (volume->mount) + { + delete_mount_point( volume->mount ); + volume->mount = NULL; + } + } + + if (!volume->mount) + volume->mount = add_volume_mount_point( disk_device->dev_obj, &disk_device->name, &volume->guid ); + + if (volume->mount) + { + void *id = NULL; + unsigned int id_len = 0; + + if (disk_device->unix_mount) + { + id = disk_device->unix_mount; + id_len = strlen( disk_device->unix_mount ) + 1; + } + set_mount_point_id( volume->mount, id, id_len ); + } + return STATUS_SUCCESS; +} + /* set or change the drive letter for an existing drive */ static void set_drive_letter( struct dos_drive *drive, int letter ) { @@ -551,6 +608,40 @@ static void create_drive_devices(void) RtlFreeHeap( GetProcessHeap(), 0, path ); } +/* create a new disk volume */ +NTSTATUS add_volume( const char *udi, const char *device, const char *mount_point, + enum device_type type, const GUID *guid ) +{ + struct volume *volume; + NTSTATUS status; + + TRACE( "adding %s device %s mount %s type %u uuid %s\n", debugstr_a(udi), + debugstr_a(device), debugstr_a(mount_point), type, debugstr_guid(guid) ); + + LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) + if (volume->udi && !strcmp( udi, volume->udi )) goto found; + + if ((status = create_volume( udi, type, &volume ))) return status; + +found: + return set_volume_info( volume, device, mount_point, type, guid ); +} + +/* create a new disk volume */ +NTSTATUS remove_volume( const char *udi ) +{ + struct volume *volume; + + LIST_FOR_EACH_ENTRY( volume, &volumes_list, struct volume, entry ) + { + if (!volume->udi || strcmp( udi, volume->udi )) continue; + delete_volume( volume ); + return STATUS_SUCCESS; + } + return STATUS_NO_SUCH_DEVICE; +} + + /* create a new dos drive */ NTSTATUS add_dos_device( int letter, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid ) diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index d61bb7d..0ba1086 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -51,6 +51,9 @@ enum device_type DEVICE_RAMDISK }; +extern NTSTATUS add_volume( const char *udi, const char *device, const char *mount_point, + enum device_type type, const GUID *guid ); +extern NTSTATUS remove_volume( const char *udi ); extern NTSTATUS add_dos_device( int letter, const char *udi, const char *device, const char *mount_point, enum device_type type, const GUID *guid ); extern NTSTATUS remove_dos_device( int letter, const char *udi );

1 0

Paul Vriens : transl: Don't show untranslated English (US) resources.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: tools Branch: master Commit: c0a88aac79917d02df2bf1a268ef64c143c4ab3f URL: http://source.winehq.org/git/tools.git/?a=commit;h=c0a88aac79917d02df2bf1a2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 22 15:00:13 2009 +0200 transl: Don't show untranslated English (US) resources. --- transl/scripts/checkmakefile.pl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 4dcf5ac..66a0909 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -261,6 +261,8 @@ sub mycheck next if ($lang eq $basic_lang); + next if (($lang eq "009:01") && ($transl_count{$lang} == 0)); + open(LANGOUT, ">>$workdir/langs/$lang"); print LANGOUT "FILE STAT $dir ".($transl_count{$lang}+0)." ".($missing_count{$lang}+0)." ".($err_count{$lang}+0)."\n"; @@ -291,7 +293,7 @@ sub mycheck foreach my $lang (keys %languages) { - next if (exists $transl_count{"009:01"} && $transl_count{"009:01"} == 0); + next if ($transl_count{"009:01"} == 0); my @transl = grep {$_ eq $lang} keys %file_langs; if ($#transl == -1) {

1 0

Alexandre Julliard : transl: Remove the no longer needed SCRIPTSDIR parameter.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: tools Branch: master Commit: 75bf08b6b6b57d5327c5ba9c74730a7b9723d678 URL: http://source.winehq.org/git/tools.git/?a=commit;h=75bf08b6b6b57d5327c5ba9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 16:03:49 2009 +0200 transl: Remove the no longer needed SCRIPTSDIR parameter. --- transl/scripts/Master.sh | 2 +- transl/scripts/checkmakefile.pl | 5 +---- transl/scripts/config-example | 3 --- winetest/make-winetest | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index b08383e..4a0df39 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -46,7 +46,7 @@ mkdir $WORKDIR/dumps mkdir $WORKDIR/dumps/res # Analyze all the Makefiles -$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit +$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit # Show any changes in the log diff -u $WORKDIR/run.log.old $WORKDIR/run.log diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index ca62dae..4dcf5ac 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -8,7 +8,7 @@ use Cwd; use File::Basename; # configuration parameters -my (%CONFIG, $srcdir, $objdir, $toolsdir, $workdir, $scriptsdir, $wrc); +my (%CONFIG, $srcdir, $objdir, $toolsdir, $workdir, $wrc); sub shell($) { @@ -326,7 +326,6 @@ while (@ARGV && $ARGV[0] =~ /^-/) my $opt = shift @ARGV; if ($opt eq "-S") { $srcdir = shift @ARGV; } elsif ($opt eq "-T") { $objdir = shift @ARGV; } - elsif ($opt eq "-s") { $scriptsdir = shift @ARGV; } elsif ($opt eq "-t") { $toolsdir = shift @ARGV; } elsif ($opt eq "-w") { $workdir = shift @ARGV; } else @@ -335,7 +334,6 @@ while (@ARGV && $ARGV[0] =~ /^-/) print STDERR " -S dir Set the top of the Wine source tree\n"; print STDERR " -T dir Set the top of the Wine build tree\n"; print STDERR " -t dir Set the Wine tools directory\n"; - print STDERR " -s dir Set the scripts directory\n"; print STDERR " -w dir Set the work directory\n"; exit 1; } @@ -345,7 +343,6 @@ $srcdir ||= $CONFIG{"SOURCEROOT"}; $objdir ||= $CONFIG{"BUILDROOT"} || $srcdir; $toolsdir ||= $CONFIG{"WRCROOT"} || $objdir; $workdir ||= $CONFIG{"WORKDIR"}; -$scriptsdir ||= $CONFIG{"SCRIPTSDIR"} || "."; $wrc = $toolsdir . "/tools/wrc/wrc"; if ($srcdir eq "" || $wrc eq "/tools/wrc/wrc" || $workdir eq "") diff --git a/transl/scripts/config-example b/transl/scripts/config-example index 47cc4c5..2409d13 100644 --- a/transl/scripts/config-example +++ b/transl/scripts/config-example @@ -9,9 +9,6 @@ BUILDROOT=/path/to/wine-src # Path to the Wine tree to take wrc from. Usually the same as SOURCEROOT. WRCROOT=/path/to/wine-src -# Directory containing the various scripts -SCRIPTSDIR=. - # The directory where to store the generated langs/ and dumps/. Usually the # directory with the PHP scripts. DESTDIR=../php diff --git a/winetest/make-winetest b/winetest/make-winetest index 15833b9..50903f6 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -132,7 +132,7 @@ umask 022 rm -rf work mkdir work work/langs work/dumps work/dumps/res - $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/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work 2>>work/run.log mv -f $transldir/langs $transldir/langs.old mv -f $transldir/dumps $transldir/dumps.old mv -f work/langs $transldir/langs

1 0

André Hentschel : transl: Add doctype header.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: tools Branch: master Commit: aeb156e9b26f81203f302197119462762b50e8b6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=aeb156e9b26f81203f302197… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 21 17:48:16 2009 +0200 transl: Add doctype header. --- transl/php/lang.php | 1 + transl/php/resfile.php | 1 + transl/php/resource.php | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/transl/php/lang.php b/transl/php/lang.php index 5ee2ca8..21b2dea 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -78,6 +78,7 @@ function dump_table($table) } ?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 4614755..8245e26 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -8,6 +8,7 @@ $resfile = validate_resfile($_REQUEST['resfile']); $file = fopen("$DATAROOT/langs/$lang", "r"); $msgs = array(); ?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <link rel="stylesheet" href="style.css" type="text/css"> diff --git a/transl/php/resource.php b/transl/php/resource.php index f048a2d..68a9e55 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -10,6 +10,7 @@ $id = validate_id($_REQUEST['id']); $compare = isset($_REQUEST['compare']); ?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <link rel="stylesheet" href="style.css" type="text/css">

1 0

Alexandre Julliard : transl: Remove references to no longer used directories.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: tools Branch: master Commit: 1f32a5c55ce03ace51402e89ea96f6bb28d6e5bc URL: http://source.winehq.org/git/tools.git/?a=commit;h=1f32a5c55ce03ace51402e89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 14:38:38 2009 +0200 transl: Remove references to no longer used directories. --- transl/scripts/Master.sh | 11 ----------- winetest/make-winetest | 9 +-------- 2 files changed, 1 insertions(+), 19 deletions(-) diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index a1e1747..b08383e 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -41,22 +41,13 @@ fi # Do cleanup for new run rm -Rf $WORKDIR/langs rm -Rf $WORKDIR/dumps -rm -Rf $WORKDIR/new-langs mkdir $WORKDIR/langs mkdir $WORKDIR/dumps mkdir $WORKDIR/dumps/res -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 -# Check for a new languages -for i in $WORKDIR/new-langs/*; do - if [ -f "$i" ]; then - echo "note: New language:" `basename "$i"` | tee -a $WORKDIR/run.log - fi -done - # Show any changes in the log diff -u $WORKDIR/run.log.old $WORKDIR/run.log @@ -67,8 +58,6 @@ mv -f $WORKDIR/langs $DESTDIR/langs mv -f $WORKDIR/dumps $DESTDIR/dumps cp -f $WORKDIR/run.log $DESTDIR/dumps/run.log -rsync -r --delete $SCRIPTSDIR/conf $DESTDIR - # Deleting can take a bit longer so we do it after the new version is set up rm -Rf $DESTDIR/langs.old rm -Rf $DESTDIR/dumps.old diff --git a/winetest/make-winetest b/winetest/make-winetest index 3b492ce..15833b9 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -131,15 +131,8 @@ umask 022 # update the translations status rm -rf work - mkdir work work/langs work/dumps work/dumps/res work/new-langs + mkdir work work/langs work/dumps work/dumps/res $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work -s "$toolsdir/transl/scripts" 2>>work/run.log - for i in work/new-langs/* - do - if [ -f "$i" ] - then - echo "note: New language:" `basename "$i"` | tee -a work/run.log - fi - done mv -f $transldir/langs $transldir/langs.old mv -f $transldir/dumps $transldir/dumps.old mv -f work/langs $transldir/langs

1 0

André Hentschel : transl: Remove the slash from tags.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: tools Branch: master Commit: 815e7569c49c82bc50796371853382494aa89188 URL: http://source.winehq.org/git/tools.git/?a=commit;h=815e7569c49c82bc50796371… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 21 17:41:17 2009 +0200 transl: Remove the slash from tags. --- transl/php/index.php | 2 +- transl/php/resfile.php | 2 +- transl/php/resource.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index 6cd0c7e..4e37347 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -23,7 +23,7 @@ while ($line = fgets($summary, 1024)) <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <link rel="stylesheet" href="style.css" type="text/css"/> + <link rel="stylesheet" href="style.css" type="text/css"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Wine translation statistics <?php echo $TITLE_APPENDIX ?></title> </head> diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 71e3c19..4614755 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -10,7 +10,7 @@ $msgs = array(); ?> <html> <head> - <link rel="stylesheet" href="style.css" type="text/css"/> + <link rel="stylesheet" href="style.css" type="text/css"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title>Module <?php echo $resfile?> - Wine translations</title> </head> diff --git a/transl/php/resource.php b/transl/php/resource.php index b88e30d..f048a2d 100644 --- a/transl/php/resource.php +++ b/transl/php/resource.php @@ -12,7 +12,7 @@ $compare = isset($_REQUEST['compare']); ?> <html> <head> - <link rel="stylesheet" href="style.css" type="text/css"/> + <link rel="stylesheet" href="style.css" type="text/css"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <title><?php echo get_resource_name($type, $id) ?> from <?php echo $resfile?> - Wine translation</title> </head>

1 0

Paul Vriens : transl: Remove conf files.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: tools Branch: master Commit: 155c545672d538685bb299e0831b3cc4469b7bea URL: http://source.winehq.org/git/tools.git/?a=commit;h=155c545672d538685bb299e0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jul 21 18:11:13 2009 +0200 transl: Remove conf files. --- transl/.gitignore | 1 - transl/scripts/conf/002:01 | 1 - transl/scripts/conf/003:01 | 1 - transl/scripts/conf/004:01 | 1 - transl/scripts/conf/004:02 | 1 - transl/scripts/conf/005:00 | 1 - transl/scripts/conf/006:01 | 1 - transl/scripts/conf/007:00 | 1 - transl/scripts/conf/008:01 | 1 - transl/scripts/conf/009:00 | 1 - transl/scripts/conf/009:01 | 1 - transl/scripts/conf/00a:00 | 1 - transl/scripts/conf/00b:01 | 1 - transl/scripts/conf/00c:00 | 1 - transl/scripts/conf/00e:00 | 1 - transl/scripts/conf/010:00 | 1 - transl/scripts/conf/011:00 | 1 - transl/scripts/conf/012:00 | 1 - transl/scripts/conf/013:00 | 1 - transl/scripts/conf/014:01 | 1 - transl/scripts/conf/015:00 | 1 - transl/scripts/conf/016:00 | 1 - transl/scripts/conf/016:01 | 1 - transl/scripts/conf/016:02 | 1 - transl/scripts/conf/017:01 | 1 - transl/scripts/conf/018:00 | 1 - transl/scripts/conf/019:00 | 1 - transl/scripts/conf/01b:00 | 1 - transl/scripts/conf/01d:00 | 1 - transl/scripts/conf/01e:01 | 1 - transl/scripts/conf/01f:01 | 1 - transl/scripts/conf/022:01 | 1 - transl/scripts/conf/024:00 | 1 - transl/scripts/conf/027:00 | 1 - transl/scripts/conf/08f:00 | 1 - transl/scripts/conf/090:01 | 1 - 36 files changed, 0 insertions(+), 36 deletions(-) diff --git a/transl/.gitignore b/transl/.gitignore index af334cb..9e6aaf8 100644 --- a/transl/.gitignore +++ b/transl/.gitignore @@ -2,6 +2,5 @@ /scripts/config /scripts/local-posthook.sh /scripts/local-prehook.sh -/php/conf /php/dumps /php/langs \ No newline at end of file diff --git a/transl/scripts/conf/002:01 b/transl/scripts/conf/002:01 deleted file mode 100644 index 956bbd8..0000000 --- a/transl/scripts/conf/002:01 +++ /dev/null @@ -1 +0,0 @@ -Bulgarian \ No newline at end of file diff --git a/transl/scripts/conf/003:01 b/transl/scripts/conf/003:01 deleted file mode 100644 index 86d394c..0000000 --- a/transl/scripts/conf/003:01 +++ /dev/null @@ -1 +0,0 @@ -Catalan \ No newline at end of file diff --git a/transl/scripts/conf/004:01 b/transl/scripts/conf/004:01 deleted file mode 100644 index 849d939..0000000 --- a/transl/scripts/conf/004:01 +++ /dev/null @@ -1 +0,0 @@ -Chinese (Traditional) \ No newline at end of file diff --git a/transl/scripts/conf/004:02 b/transl/scripts/conf/004:02 deleted file mode 100644 index bb1d20d..0000000 --- a/transl/scripts/conf/004:02 +++ /dev/null @@ -1 +0,0 @@ -Chinese (Simplified) \ No newline at end of file diff --git a/transl/scripts/conf/005:00 b/transl/scripts/conf/005:00 deleted file mode 100644 index ba26bf3..0000000 --- a/transl/scripts/conf/005:00 +++ /dev/null @@ -1 +0,0 @@ -Czech[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/006:01 b/transl/scripts/conf/006:01 deleted file mode 100644 index fa9fc5f..0000000 --- a/transl/scripts/conf/006:01 +++ /dev/null @@ -1 +0,0 @@ -Danish \ No newline at end of file diff --git a/transl/scripts/conf/007:00 b/transl/scripts/conf/007:00 deleted file mode 100644 index 36ffaed..0000000 --- a/transl/scripts/conf/007:00 +++ /dev/null @@ -1 +0,0 @@ -German \ No newline at end of file diff --git a/transl/scripts/conf/008:01 b/transl/scripts/conf/008:01 deleted file mode 100644 index 721b5e7..0000000 --- a/transl/scripts/conf/008:01 +++ /dev/null @@ -1 +0,0 @@ -Greek \ No newline at end of file diff --git a/transl/scripts/conf/009:00 b/transl/scripts/conf/009:00 deleted file mode 100644 index 7ab7830..0000000 --- a/transl/scripts/conf/009:00 +++ /dev/null @@ -1 +0,0 @@ -English (Neutral) \ No newline at end of file diff --git a/transl/scripts/conf/009:01 b/transl/scripts/conf/009:01 deleted file mode 100644 index 1d682ab..0000000 --- a/transl/scripts/conf/009:01 +++ /dev/null @@ -1 +0,0 @@ -English (US) \ No newline at end of file diff --git a/transl/scripts/conf/00a:00 b/transl/scripts/conf/00a:00 deleted file mode 100644 index f52eec4..0000000 --- a/transl/scripts/conf/00a:00 +++ /dev/null @@ -1 +0,0 @@ -Spanish \ No newline at end of file diff --git a/transl/scripts/conf/00b:01 b/transl/scripts/conf/00b:01 deleted file mode 100644 index 9a417fa..0000000 --- a/transl/scripts/conf/00b:01 +++ /dev/null @@ -1 +0,0 @@ -Finnish \ No newline at end of file diff --git a/transl/scripts/conf/00c:00 b/transl/scripts/conf/00c:00 deleted file mode 100644 index d098706..0000000 --- a/transl/scripts/conf/00c:00 +++ /dev/null @@ -1 +0,0 @@ -French \ No newline at end of file diff --git a/transl/scripts/conf/00e:00 b/transl/scripts/conf/00e:00 deleted file mode 100644 index d83d763..0000000 --- a/transl/scripts/conf/00e:00 +++ /dev/null @@ -1 +0,0 @@ -Hungarian[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/010:00 b/transl/scripts/conf/010:00 deleted file mode 100644 index 0c26025..0000000 --- a/transl/scripts/conf/010:00 +++ /dev/null @@ -1 +0,0 @@ -Italian \ No newline at end of file diff --git a/transl/scripts/conf/011:00 b/transl/scripts/conf/011:00 deleted file mode 100644 index 7123dbe..0000000 --- a/transl/scripts/conf/011:00 +++ /dev/null @@ -1 +0,0 @@ -Japanese[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/012:00 b/transl/scripts/conf/012:00 deleted file mode 100644 index 060827f..0000000 --- a/transl/scripts/conf/012:00 +++ /dev/null @@ -1 +0,0 @@ -Korean[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/013:00 b/transl/scripts/conf/013:00 deleted file mode 100644 index cc3acaa..0000000 --- a/transl/scripts/conf/013:00 +++ /dev/null @@ -1 +0,0 @@ -Dutch \ No newline at end of file diff --git a/transl/scripts/conf/014:01 b/transl/scripts/conf/014:01 deleted file mode 100644 index 0a62430..0000000 --- a/transl/scripts/conf/014:01 +++ /dev/null @@ -1 +0,0 @@ -Norwegian (Bokmal) \ No newline at end of file diff --git a/transl/scripts/conf/015:00 b/transl/scripts/conf/015:00 deleted file mode 100644 index f8e03c0..0000000 --- a/transl/scripts/conf/015:00 +++ /dev/null @@ -1 +0,0 @@ -Polish[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/016:00 b/transl/scripts/conf/016:00 deleted file mode 100644 index edbd93f..0000000 --- a/transl/scripts/conf/016:00 +++ /dev/null @@ -1 +0,0 @@ -Portuguese (Neutral) diff --git a/transl/scripts/conf/016:01 b/transl/scripts/conf/016:01 deleted file mode 100644 index 5cd7cf5..0000000 --- a/transl/scripts/conf/016:01 +++ /dev/null @@ -1 +0,0 @@ -Portugese (Brazilian) \ No newline at end of file diff --git a/transl/scripts/conf/016:02 b/transl/scripts/conf/016:02 deleted file mode 100644 index 2701fef..0000000 --- a/transl/scripts/conf/016:02 +++ /dev/null @@ -1 +0,0 @@ -Portugese (Portugal) \ No newline at end of file diff --git a/transl/scripts/conf/017:01 b/transl/scripts/conf/017:01 deleted file mode 100644 index 9d0ddbd..0000000 --- a/transl/scripts/conf/017:01 +++ /dev/null @@ -1 +0,0 @@ -Romansh (Switzerland) \ No newline at end of file diff --git a/transl/scripts/conf/018:00 b/transl/scripts/conf/018:00 deleted file mode 100644 index 8258690..0000000 --- a/transl/scripts/conf/018:00 +++ /dev/null @@ -1 +0,0 @@ -Romanian[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/019:00 b/transl/scripts/conf/019:00 deleted file mode 100644 index 74ecec6..0000000 --- a/transl/scripts/conf/019:00 +++ /dev/null @@ -1 +0,0 @@ -Russian[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/01b:00 b/transl/scripts/conf/01b:00 deleted file mode 100644 index 399b1c9..0000000 --- a/transl/scripts/conf/01b:00 +++ /dev/null @@ -1 +0,0 @@ -Slovak[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/01d:00 b/transl/scripts/conf/01d:00 deleted file mode 100644 index 8c590c4..0000000 --- a/transl/scripts/conf/01d:00 +++ /dev/null @@ -1 +0,0 @@ -Swedish \ No newline at end of file diff --git a/transl/scripts/conf/01e:01 b/transl/scripts/conf/01e:01 deleted file mode 100644 index d0333f5..0000000 --- a/transl/scripts/conf/01e:01 +++ /dev/null @@ -1 +0,0 @@ -Thai \ No newline at end of file diff --git a/transl/scripts/conf/01f:01 b/transl/scripts/conf/01f:01 deleted file mode 100644 index aa73ef2..0000000 --- a/transl/scripts/conf/01f:01 +++ /dev/null @@ -1 +0,0 @@ -Turkish \ No newline at end of file diff --git a/transl/scripts/conf/022:01 b/transl/scripts/conf/022:01 deleted file mode 100644 index a782714..0000000 --- a/transl/scripts/conf/022:01 +++ /dev/null @@ -1 +0,0 @@ -Ukrainian \ No newline at end of file diff --git a/transl/scripts/conf/024:00 b/transl/scripts/conf/024:00 deleted file mode 100644 index fde8a50..0000000 --- a/transl/scripts/conf/024:00 +++ /dev/null @@ -1 +0,0 @@ -Slovenian[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/027:00 b/transl/scripts/conf/027:00 deleted file mode 100644 index dc243c5..0000000 --- a/transl/scripts/conf/027:00 +++ /dev/null @@ -1 +0,0 @@ -Lithuanian diff --git a/transl/scripts/conf/08f:00 b/transl/scripts/conf/08f:00 deleted file mode 100644 index 8c90610..0000000 --- a/transl/scripts/conf/08f:00 +++ /dev/null @@ -1 +0,0 @@ -Esperanto[ignore-sublang] \ No newline at end of file diff --git a/transl/scripts/conf/090:01 b/transl/scripts/conf/090:01 deleted file mode 100644 index b7743ee..0000000 --- a/transl/scripts/conf/090:01 +++ /dev/null @@ -1 +0,0 @@ -Walon \ No newline at end of file

1 0