wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Alexandre Julliard : ntdll: Take loadorder into account also for a main exe in .so format.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: f1e614027b5bb4129976ad5fca8caceac573f549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1e614027b5bb4129976ad5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 09:20:55 2021 +0200 ntdll: Take loadorder into account also for a main exe in .so format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50956 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index cbafa0d8882..28d2be0b770 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1420,7 +1420,8 @@ found: /*********************************************************************** * open_main_image */ -static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFORMATION *info ) +static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFORMATION *info, + enum loadorder loadorder ) { static const WCHAR soW[] = {'.','s','o',0}; UNICODE_STRING nt_name; @@ -1432,6 +1433,8 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO HANDLE mapping; WCHAR *p; + if (loadorder == LO_DISABLED) NtTerminateProcess( GetCurrentProcess(), STATUS_DLL_NOT_FOUND ); + init_unicode_string( &nt_name, image ); InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); if (nt_to_unix_file_name( &nt_name, &unix_name, NULL, FILE_OPEN )) return STATUS_DLL_NOT_FOUND; @@ -1445,7 +1448,7 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO if (!status) NtQuerySection( mapping, SectionImageInformation, info, sizeof(*info), NULL ); NtClose( mapping ); } - else if (status == STATUS_INVALID_IMAGE_NOT_MZ) + else if (status == STATUS_INVALID_IMAGE_NOT_MZ && loadorder != LO_NATIVE) { /* remove .so extension from Windows name */ p = image + wcslen(image); @@ -1468,6 +1471,7 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHAR *curdir, WCHAR **image, void **module ) { + enum loadorder loadorder = LO_INVALID; UNICODE_STRING nt_name; WCHAR *tmp = NULL; BOOL contains_path; @@ -1480,7 +1484,8 @@ NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHA if (unix_name && unix_name[0] == '/' && !stat( unix_name, &st )) { if ((status = unix_to_nt_file_name( unix_name, image ))) goto failed; - status = open_main_image( *image, module, &main_image_info ); + loadorder = get_load_order( &nt_name ); + status = open_main_image( *image, module, &main_image_info, loadorder ); if (status != STATUS_DLL_NOT_FOUND) return status; free( *image ); } @@ -1497,12 +1502,14 @@ NTSTATUS load_main_exe( const WCHAR *dos_name, const char *unix_name, const WCHA if ((status = get_full_path( dos_name, curdir, image ))) goto failed; free( tmp ); - status = open_main_image( *image, module, &main_image_info ); + init_unicode_string( &nt_name, *image ); + if (loadorder == LO_INVALID) loadorder = get_load_order( &nt_name ); + + status = open_main_image( *image, module, &main_image_info, loadorder ); if (status != STATUS_DLL_NOT_FOUND) return status; /* if path is in system dir, we can load the builtin even if the file itself doesn't exist */ - init_unicode_string( &nt_name, *image ); - if (is_builtin_path( &nt_name, &machine )) + if (loadorder != LO_NATIVE && is_builtin_path( &nt_name, &machine )) { status = find_builtin_dll( &nt_name, module, &size, &main_image_info, machine, FALSE ); if (status != STATUS_DLL_NOT_FOUND) return status;

1 0

Alexandre Julliard : wine.inf: Also install start.exe in syswow64.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: wine Branch: master Commit: ee13ab0f022f1b89cdc0e6f36ac55a5fb151d6fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee13ab0f022f1b89cdc0e6f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 11 12:20:16 2021 +0200 wine.inf: Also install start.exe in syswow64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50867 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 45ba4fabfa1..d699bd1e4f3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2608,6 +2608,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,ddhelp.exe 11,,dosx.exe 11,,dsound.vxd +11,,start.exe 11,,winhlp32.exe 52,win40\0,wineps16.drv,wineps16.drv16 @@ -2674,7 +2675,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,explorer.exe 11,,iexplore.exe 11,,notepad.exe -11,,start.exe 11,,winetest.exe,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,-

1 0

Francois Gouget : winetest/gather: Add --update-all to force refresh all builds.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: tools Branch: master Commit: fce6cff49b2c6c2490f447f495579a858cfa4b89 URL: https://source.winehq.org/git/tools.git/?a=commit;h=fce6cff49b2c6c2490f447f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 12 11:16:35 2021 +0200 winetest/gather: Add --update-all to force refresh all builds. This allows moving the reports to the right index after modifying the platform groups. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/winetest/gather b/winetest/gather index 1a61b0c..750f0ee 100755 --- a/winetest/gather +++ b/winetest/gather @@ -176,7 +176,7 @@ my %idmap = (95 => \%w95, 98 => \%w98, me => \%me, # Command line processing # -my ($opt_workdir, $builddir, $usage); +my ($opt_workdir, $builddir, $update_all, $usage); sub check_opt_val($$) { @@ -207,6 +207,10 @@ while (@ARGV) { $builddir = check_opt_val($arg, $builddir); } + elsif ($arg eq "--update-all") + { + $update_all = 1; + } elsif ($arg eq "--help") { $usage = 0; @@ -235,10 +239,18 @@ if (!defined $usage) error("'$workdir' is not a valid work directory\n"); $usage = 2; } - if (defined $builddir and !-f "$builddir/summary.txt") + if (defined $builddir) { - error("the '$builddir' build directory is not valid\n"); - $usage = 1; + if (!-f "$builddir/summary.txt") + { + error("the '$builddir' build directory is not valid\n"); + $usage = 1; + } + elsif ($update_all) + { + error("--update and --update-all are mutually exclusive\n"); + $usage = 2; + } } } if (defined $usage) @@ -249,7 +261,7 @@ if (defined $usage) exit $usage; } print <<EOF; -Usage: $name0 [--workdir DIR] [--update BUILD] [--help] +Usage: $name0 [--workdir DIR] [--update BUILD|--update-all] [--help] Identifies one build that received new reports and updates its summary and HTML index files. @@ -260,6 +272,8 @@ Where: --update BUILD Forcefully refreshes the specified build directory. BUILD should be a full path. If an outdated file is present, it is removed. + --update-all Forcefully refreshes every build directory. This can be + used when the platform groups have been modified. --help Shows this usage message. Actions: @@ -283,6 +297,19 @@ EOF exit 0; } +if ($update_all) +{ + my @cmd = ($0, "--workdir", $workdir, "--update"); + foreach my $builddir (glob "$workdir/data/*") + { + next if ($builddir !~ m~/data/[0-9a-f]{40}$~); + next if (!-d $builddir); + my $rc = system(@cmd, $builddir); + exit $rc if ($rc != 0 and $rc != 2); + } + exit 0; +} + chdir($workdir) or die "could not chdir to the work directory: $!"; if (!defined $builddir)

1 0

Francois Gouget : winetest: Move the scripts documentation to the usage message.
by Alexandre Julliard 12 Apr '21

12 Apr '21

Module: tools Branch: master Commit: f71c9c67285218933537f768be6741b7e64acb1e URL: https://source.winehq.org/git/tools.git/?a=commit;h=f71c9c67285218933537f76… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 12 11:16:25 2021 +0200 winetest: Move the scripts documentation to the usage message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 34 +++++++++++++++++--------- winetest/dissect | 69 +++++++++++++++++++++++++++++----------------------- winetest/gather | 60 +++++++++++++++++++++++++-------------------- 3 files changed, 95 insertions(+), 68 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 94453f4..01533c4 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -1,6 +1,7 @@ #!/usr/bin/perl # # Copyright 2008 Alexandre Julliard <julliard(a)winehq.org> +# Copyright 2014-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -15,9 +16,6 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# This program creates the global index of all the builds for which we have -# WineTest result data. use strict; use warnings; @@ -175,14 +173,28 @@ if (defined $usage) error("try '$name0 --help' for more information\n"); exit $usage; } - print "Usage: $name0 [--workdir DIR] [--help]\n"; - print "\n"; - print "Processes the build summaries to generate the global index.\n"; - print "\n"; - print "Where:\n"; - print " --workdir DIR Specifies the directory containing the winetest website\n"; - print " files.\n"; - print " --help Shows this usage message.\n"; + print <<EOF; +Usage: $name0 [--workdir DIR] [--help] + +Processes the build summaries to generate the global index and per-test +index pages. + +Where: + --workdir DIR Specifies the directory containing the winetest website + files. Can be omitted if set in winetest.conf. + --help Shows this usage message. + +Actions: + $name0 should be called after the gather script has updated all the builds. + +Generated files: + \$workdir/data/index.html + \$workdir/data/tests/TEST:UNIT.html + +Exit: + 0 - success + 2 - usage error +EOF exit 0; } diff --git a/winetest/dissect b/winetest/dissect index 43b2754..d6ce316 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -2,7 +2,7 @@ # # Copyright (C) 2004 Ferenc Wagner # Copyright (C) 2008 Alexandre Julliard -# Copyright (C) 2017, 2019 Francois Gouget +# Copyright (C) 2008-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,25 +17,6 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# This program looks for a WineTest report file matching queue/rep*/report, -# takes it apart in its directory while also creating summary.txt. If an error -# occurs the directory is renamed to errXXXXX to avoid future attempts at -# processing this report. -# If everything goes flawlessly the whole directory is renamed (based on the -# information learned in the process) to data/BUILD/VERSION_TAG_DIGIT -# where DIGIT is for resolving name clashes and data/BUILD/outdated is -# created to signal the change in the given build. -# -# To test this script: -# - Put a test report in queue/rep1/report -# - Run ./dissect -# - Examine the result in data/ -# -# Exit: 0 - successfully processed a report, call again -# 1 - failed to process a report, call again -# 2 - there was nothing to do -# 3 - fatal error, something went utterly wrong use strict; use warnings; @@ -183,16 +164,44 @@ if (defined $usage) error("try '$name0 --help' for more information\n"); exit $usage; } - print "Usage: $name0 [--workdir DIR] [--update REPORT] [--help]\n"; - print "\n"; - print "Processes a test report to generate the corresponding HTML files.\n"; - print "\n"; - print "Where:\n"; - print " --workdir DIR Specifies the directory containing the winetest website\n"; - print " files.\n"; - print " --update REPORT Updates the HTML files of the specified test report. Note that\n"; - print " it must have already been moved into place.\n"; - print " --help Shows this usage message.\n"; + print <<EOF; +Usage: $name0 [--workdir DIR] [--update REPORT] [--help] + +Processes a test report to generate the corresponding HTML files. + +Where: + --workdir DIR Specifies the directory containing the winetest website + files. Can be omitted if set in winetest.conf. + --update REPORT Updates the HTML files of the specified test report. Note + that it must have already been moved into place. + --help Shows this usage message. + +Actions: + $name0 looks for a WineTest report file matching queue/rep*/report, + takes it apart in its directory while also creating summary.txt. If an error + occurs the directory is renamed to errXXXXX to avoid future attempts at + processing this report. + + If everything goes flawlessly the whole directory is renamed (based on the + information learned in the process) to data/BUILD/PLATFORM_TAG_DIGIT + where DIGIT is for resolving name clashes and data/BUILD/outdated is + created to signal the change in the given build. + +Generated files: + \$workdir/queue/errXXXXX/error + \$workdir/queue/errXXXXX/summary.txt + or + \$workdir/data/BUILD/outdated + \$workdir/data/BUILD/PLATFORM_TAG_DIGIT/summary.txt + \$workdir/data/BUILD/PLATFORM_TAG_DIGIT/report.html + \$workdir/data/BUILD/PLATFORM_TAG_DIGIT/TEST:UNIT.html + +Exit: + 0 - successfully processed a report, call again + 1 - failed to process a report, call again + 2 - there was nothing to do or usage error + 3 - fatal error, something went utterly wrong +EOF exit 0; } diff --git a/winetest/gather b/winetest/gather index 79bea91..1a61b0c 100755 --- a/winetest/gather +++ b/winetest/gather @@ -1,6 +1,7 @@ #!/usr/bin/perl # # Copyright (C) 2004 Ferenc Wagner +# Copyright (C) 2008-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -15,24 +16,6 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# This program looks for builds that have received new reports. These are -# identified by the presence of a file matching data/*/outdated. -# It then creates an index.html file in the same directory and removes the -# outdated file. -# -# It is thus intended to run as a second stage invoked by the winetest.cron -# script. Races and concurrency problems must be dealt with on that higher -# level. -# -# To test this script: -# - After running dissect, run ./gather -# - Examine the result in data/ -# -# Exit: 0 - successfully processed a build, call again -# 1 - should not happen -# 2 - there was nothing to do -# 3 - fatal error, something went utterly wrong use strict; use warnings; @@ -265,15 +248,38 @@ if (defined $usage) error("try '$name0 --help' for more information\n"); exit $usage; } - print "Usage: $name0 [--workdir DIR] [--update BUILDDIR] [--help]\n"; - print "\n"; - print "Processes a build's report summaries to create the build's index files.\n"; - print "\n"; - print "Where:\n"; - print " --workdir DIR Specifies the directory containing the winetest website\n"; - print " files.\n"; - print " --update BUILDDIR Updates the HTML files of the specified build directory.\n"; - print " --help Shows this usage message.\n"; + print <<EOF; +Usage: $name0 [--workdir DIR] [--update BUILD] [--help] + +Identifies one build that received new reports and updates its summary and +HTML index files. + +Where: + --workdir DIR Specifies the directory containing the winetest website + files. Can be omitted if set in winetest.conf. + --update BUILD Forcefully refreshes the specified build directory. + BUILD should be a full path. If an outdated file is + present, it is removed. + --help Shows this usage message. + +Actions: + The build to process is identified by the presence of the data/*/outdated + file generated by the dissect script. That file is removed after all + processing is done. It is up to the caller to invoke $name0 as many times as + necessary and to deal with any concurrency issues. + +Generated files: + \$workdir/data/BUILD/summary.txt + \$workdir/data/BUILD/total.txt + \$workdir/data/BUILD/index.html + \$workdir/data/BUILD/index_GROUP.html + +Exit: + 0 - successfully processed a build, call again + 1 - should not happen + 2 - there was nothing to do or usage error + 3 - fatal error, something went utterly wrong +EOF exit 0; }

1 0

Francois Gouget : winetest/cron: Fix archiving/purging old data.
by Alexandre Julliard 10 Apr '21

10 Apr '21

Module: tools Branch: master Commit: d39eacfabf5308e8b20f6169d69e58d7f2bb565d URL: https://source.winehq.org/git/tools.git/?a=commit;h=d39eacfabf5308e8b20f616… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Apr 10 12:24:10 2021 +0200 winetest/cron: Fix archiving/purging old data. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cron | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index d7f0344..dc4108b 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -83,7 +83,7 @@ then tar cfj "$dir.tar.bz2" "$dir" touch -r "$dir" "$dir.tar.bz2" rm -rf "$dir" - fi ) + ) fi # remove old build reports if [ -n "$build_expire" ] @@ -92,7 +92,7 @@ then cd old-data find . -mtime "+$build_expire" -name "*.tar.*" -print0 | \ xargs -0 rm -f - fi ) + ) fi # remove old winetest binaries if [ -n "$winetest_expire" ] @@ -102,7 +102,7 @@ then cd builds find . -mtime "+$winetest_expire" -name "winetest*.exe" -print0 | \ xargs -0 rm -f - fi ) + ) fi # remove old queued files if [ -n "$queue_expire" ]

1 0

Alexandre Julliard : Wine release 6.6
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: website Branch: master Commit: 6021b6e80424ba00eed7709941e782a467d28c93 URL: https://source.winehq.org/git/website.git/?a=commit;h=6021b6e80424ba00eed77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 21:53:38 2021 +0200 Wine release 6.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021040901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2021040901.xml b/news/en/2021040901.xml new file mode 100644 index 00000000..3cb2e28a --- /dev/null +++ b/news/en/2021040901.xml @@ -0,0 +1,16 @@ +<news> +<date>April 9, 2021</date> +<title>Wine 6.6 Released</title> +<body> + The Wine development release 6.6 is now available. + <a href="{$root}/announce/6.6">What's new</a> in this release: +<ul> + <li>Mono engine updated to version 6.1.1, with upstream updates.</li> + <li>DWrite and DnsApi libraries converted to PE.</li> + <li>Plug & play driver support improvements.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.6.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.6 : Alexandre Julliard : Release 6.6
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: wine Branch: refs/tags/wine-6.6 Tag: a0641c634883eeed8b5fa7c8ec230c0ea6889971 URL: https://source.winehq.org/git/wine.git/?a=tag;h=a0641c634883eeed8b5fa7c8ec2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 21:51:46 2021 +0200 Release 6.6

1 0

Alexandre Julliard : Release 6.6.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: wine Branch: master Commit: a24bdfc2c69c5648cbb3df762149b2647e209a09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a24bdfc2c69c5648cbb3df76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 21:51:46 2021 +0200 Release 6.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 942 +++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 451 insertions(+), 511 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a24bdfc2c69c5648cbb3…

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: wine Branch: master Commit: c3645c1f2272349951e2abfe847239e1b3d3baf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3645c1f2272349951e2abfe… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Fri Apr 9 10:24:17 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/po/nl.po b/po/nl.po index f5b2554991d..e5ea842cfea 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-03-26 15:45+0100\n" +"PO-Revision-Date: 2021-04-09 10:15+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -3974,7 +3974,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "Kan de eigenschap '|' niet definiëren: object is niet uitbreidbaar" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -14566,10 +14566,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "De bewerking is succesvol voltooid\n" +msgstr "reg: De bewerking is succesvol voltooid\n" #: programs/reg/reg.rc:117 msgid "reg: Invalid registry key\n" @@ -14584,13 +14582,8 @@ msgid "reg: Unable to access remote machine\n" msgstr "reg: Kan de computer op afstand niet benaderen\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "" -"reg: Het systeem kon de gespecificeerde registersleutel of waarde niet " -"vinden\n" +msgstr "reg: Kan de gegeven registerwaarde niet vinden\n" #: programs/reg/reg.rc:121 msgid "reg: Unsupported registry data type [%1]\n" @@ -14613,10 +14606,8 @@ msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgstr "De registerwaarde '%1' bestand bestaat al. Wilt u het vervangen?" #: programs/reg/reg.rc:129 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "De register bewerking is afgebroken\n" +msgstr "reg: De register bewerking is afgebroken\n" #: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -14778,19 +14769,12 @@ msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Het bestand '%1' bestaat al. Wilt u het overschrijven?" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "" -"reg: Het systeem kon de gespecificeerde registersleutel of waarde niet " -"vinden\n" +msgstr "reg: Kan de gegeven registersleutel niet vinden\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: Onmogelijk om de registersleutel '%1' te openen.\n" +msgstr "reg: Importeren van de registersleutel '%1' is niet mogelijk.\n" #: programs/reg/reg.rc:179 msgid "" @@ -14801,6 +14785,13 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" /reg:32\n" +" Open de 32-bits weergave van het register.\n" +"\n" +" /reg:64\n" +" Open de 64-bits weergave van het register.\n" +"\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 09 Apr '21

09 Apr '21

Module: wine Branch: master Commit: dc540b9dc4a08ed1781a3e97045e4c80f1b5eaf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc540b9dc4a08ed1781a3e97… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Apr 9 07:55:20 2021 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/po/fi.po b/po/fi.po index cffeda4b6e2..9e0dbcb51c6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3953,7 +3953,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "Ominaisuutta '|' ei voi määritellä: objekti ei ole laajennettava" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -14456,10 +14456,8 @@ msgstr "" "\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "Toiminnon suorittaminen onnistui\n" +msgstr "reg: Toiminnon suorittaminen onnistui\n" #: programs/reg/reg.rc:117 msgid "reg: Invalid registry key\n" @@ -14474,11 +14472,8 @@ msgid "reg: Unable to access remote machine\n" msgstr "reg: Ei pääsyä etäkoneelle\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg: Järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" +msgstr "reg: Annettua rekisteriarvoa ei löydy\n" #: programs/reg/reg.rc:121 msgid "reg: Unsupported registry data type [%1]\n" @@ -14501,10 +14496,8 @@ msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgstr "Rekisterin arvo '%1' on jo olemassa. Haluatko korvata sen?" #: programs/reg/reg.rc:129 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "Rekisterin toimenpide peruttiin\n" +msgstr "reg: Rekisterin toimenpide peruttiin\n" #: programs/reg/reg.rc:130 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -14662,17 +14655,12 @@ msgid "The file '%1' already exists. Do you want to overwrite it?" msgstr "Tiedosto '%1' on jo olemassa. Haluatko korvata sen?" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg: Järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" +msgstr "reg: Annettua rekisteriavainta ei löydy\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "reg: Rekisteriavaimen '%1' tuonti ei onnistu\n" #: programs/reg/reg.rc:179 msgid "" @@ -14683,6 +14671,12 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" Käytä rekisterin 32-bittistä näkymää.\n" +"\n" +" /reg:64\n" +" Käytä rekisterin 64-bittistä näkymää.\n" +"\n" #: programs/regedit/regedit.rc:34 msgid "&Registry"

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021