December 2013 - Wine-Commits

Alexandre Julliard : makedep: Clean up output files on failure.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 8aa529417d190bed00579d8e7a4d5f5a1e1ee018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa529417d190bed00579d8e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 28 11:47:15 2013 +0100 makedep: Clean up output files on failure. --- tools/makedep.c | 78 +++++++++++++++++++++++++++++++++--------------------- 1 files changed, 48 insertions(+), 30 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4eab2a8..9a1a978 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <signal.h> #include <string.h> #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -104,6 +105,8 @@ static const char *parent_dir; static const char *makefile_name = "Makefile"; static const char *Separator = "### Dependencies"; static const char *input_file_name; +static const char *output_file_name; +static const char *temp_file_name; static int parse_makefile_mode; static int relative_dir_mode; static int input_line; @@ -174,6 +177,25 @@ static void fatal_perror( const char *msg, ... ) /******************************************************************* + * cleanup_files + */ +static void cleanup_files(void) +{ + if (temp_file_name) unlink( temp_file_name ); + if (output_file_name) unlink( output_file_name ); +} + + +/******************************************************************* + * exit_on_signal + */ +static void exit_on_signal( int sig ) +{ + exit( 1 ); /* this will call the atexit functions */ +} + + +/******************************************************************* * xmalloc */ static void *xmalloc( size_t size ) @@ -1668,7 +1690,7 @@ static struct strarray output_sources(void) /******************************************************************* * create_temp_file */ -static FILE *create_temp_file( const char *orig, char **tmp_name ) +static FILE *create_temp_file( const char *orig ) { char *name = xmalloc( strlen(orig) + 13 ); unsigned int i, id = getpid(); @@ -1687,7 +1709,7 @@ static FILE *create_temp_file( const char *orig, char **tmp_name ) id += 7777; } if (!ret) fatal_error( "failed to create output file for '%s'\n", orig ); - *tmp_name = name; + temp_file_name = name; return ret; } @@ -1695,20 +1717,17 @@ static FILE *create_temp_file( const char *orig, char **tmp_name ) /******************************************************************* * rename_temp_file */ -static void rename_temp_file( const char *tmp_name, const char *dest ) +static void rename_temp_file( const char *dest ) { - int ret = rename( tmp_name, dest ); + int ret = rename( temp_file_name, dest ); if (ret == -1 && errno == EEXIST) { /* rename doesn't overwrite on windows */ unlink( dest ); - ret = rename( tmp_name, dest ); - } - if (ret == -1) - { - unlink( tmp_name ); - fatal_error( "failed to rename output file to '%s'\n", dest ); + ret = rename( temp_file_name, dest ); } + if (ret == -1) fatal_error( "failed to rename output file to '%s'\n", dest ); + temp_file_name = NULL; } @@ -1717,10 +1736,9 @@ static void rename_temp_file( const char *tmp_name, const char *dest ) */ static void output_gitignore( const char *dest, const struct strarray *files ) { - char *tmp_name; int i; - output_file = create_temp_file( dest, &tmp_name ); + output_file = create_temp_file( dest ); output( "# Automatically generated by make depend; DO NOT EDIT!!\n" ); output( "/.gitignore\n" ); @@ -1731,35 +1749,31 @@ static void output_gitignore( const char *dest, const struct strarray *files ) output( "%s\n", files->str[i] ); } - fclose( output_file ); + if (fclose( output_file )) fatal_perror( "write" ); output_file = NULL; - rename_temp_file( tmp_name, dest ); - free( tmp_name ); + rename_temp_file( dest ); } /******************************************************************* * output_dependencies */ -static void output_dependencies(void) +static void output_dependencies( const char *path ) { - char *tmp_name = NULL; - char *path = strmake( "%s/%s", base_dir, makefile_name ); struct strarray targets = empty_strarray; if (Separator && ((output_file = fopen( path, "r" )))) { char buffer[1024]; - FILE *tmp_file = create_temp_file( path, &tmp_name ); + FILE *tmp_file = create_temp_file( path ); int found = 0; while (fgets( buffer, sizeof(buffer), output_file ) && !found) { - if (fwrite( buffer, 1, strlen(buffer), tmp_file ) != strlen(buffer)) - fatal_error( "failed to write to %s\n", tmp_name ); + if (fwrite( buffer, 1, strlen(buffer), tmp_file ) != strlen(buffer)) fatal_perror( "write" ); found = !strncmp( buffer, Separator, strlen(Separator) ); } - fclose( output_file ); + if (fclose( output_file )) fatal_perror( "write" ); output_file = tmp_file; if (!found && !list_empty(&sources)) output( "\n%s\n", Separator ); } @@ -1773,12 +1787,7 @@ static void output_dependencies(void) fclose( output_file ); output_file = NULL; - if (tmp_name) - { - rename_temp_file( tmp_name, path ); - free( tmp_name ); - } - free( path ); + if (temp_file_name) rename_temp_file( path ); if (!src_dir) output_gitignore( strmake( "%s/.gitignore", base_dir ), &targets ); } @@ -1817,6 +1826,7 @@ static void update_makefile( const char *path ) struct incl_file *file; base_dir = path; + output_file_name = strmake( "%s/%s", base_dir, makefile_name ); parse_makefile(); src_dir = get_expanded_make_variable( "srcdir" ); @@ -1860,7 +1870,8 @@ static void update_makefile( const char *path ) } LIST_FOR_EACH_ENTRY( file, &includes, struct incl_file, entry ) parse_file( file, 0 ); - output_dependencies(); + output_dependencies( output_file_name ); + output_file_name = NULL; } @@ -1974,6 +1985,13 @@ int main( int argc, char *argv[] ) exit( 0 ); } + atexit( cleanup_files ); + signal( SIGTERM, exit_on_signal ); + signal( SIGINT, exit_on_signal ); +#ifdef SIGHUP + signal( SIGHUP, exit_on_signal ); +#endif + if (parse_makefile_mode) { for (i = 1; i < argc; i++) update_makefile( argv[i] ); @@ -1985,6 +2003,6 @@ int main( int argc, char *argv[] ) add_generated_sources(); LIST_FOR_EACH_ENTRY( pFile, &includes, struct incl_file, entry ) parse_file( pFile, 0 ); - output_dependencies(); + output_dependencies( makefile_name ); return 0; }

1 0

Alexandre Julliard : configure: Don' t create cross-compiled import libraries for 16-bit modules.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: e48720236a096db328b060da651f8108b1154375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48720236a096db328b060da6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 28 13:37:34 2013 +0100 configure: Don't create cross-compiled import libraries for 16-bit modules. --- aclocal.m4 | 6 +++--- configure | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 300196b..7760a20 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -471,7 +471,7 @@ $ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" fi - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a @@ -494,7 +494,7 @@ $ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT install install-dev:: $ac_dir/install-dev __uninstall__: $ac_dir/uninstall" - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a @@ -511,7 +511,7 @@ dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT clean:: \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT" - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: dlls/lib$ac_implib.cross.a diff --git a/configure b/configure index 50d5966..f56f46a 100755 --- a/configure +++ b/configure @@ -7344,7 +7344,7 @@ $ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" fi - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a @@ -7367,7 +7367,7 @@ $ac_dir/uninstall:: \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT install install-dev:: $ac_dir/install-dev __uninstall__: $ac_dir/uninstall" - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a @@ -7384,7 +7384,7 @@ dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT clean:: \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT" - if test -n "$CROSSTARGET" + if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ "__builddeps__: dlls/lib$ac_implib.cross.a

1 0

Nikolay Sivov : ntdll: Fix return value when failed to locate resource.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: aa4ebeb57c66c8a98cf50c9ce7f7e47cf88d1271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4ebeb57c66c8a98cf50c9ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 30 00:25:38 2013 +0400 ntdll: Fix return value when failed to locate resource. --- dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/actctx.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 9894568..ab655c0 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2146,7 +2146,6 @@ todo_wine SetLastError(0xdeadbeef); handle = pCreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); -todo_wine ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); } diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 68dd7ec..962a4e5 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2633,7 +2633,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, FALSE, file ); NtClose( file ); } - else status = STATUS_RESOURCE_DATA_NOT_FOUND; + else status = STATUS_RESOURCE_TYPE_NOT_FOUND; RtlFreeUnicodeString( &nameW ); return status; }

1 0

Frédéric Delanoy : qedit/tests: Constify some character strings.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: 7d8f8dbad925df6236283ec2d1882e7d196b9f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8f8dbad925df6236283ec2d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 28 14:10:44 2013 +0100 qedit/tests: Constify some character strings. --- dlls/qedit/tests/mediadet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 42ac7dc..c488b37 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -76,8 +76,8 @@ static WCHAR test_sound_avi_filename[MAX_PATH]; static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH]) { static WCHAR temp_path[MAX_PATH]; - static WCHAR prefix[] = {'D','E','S',0}; - static WCHAR avi[] = {'a','v','i',0}; + static const WCHAR prefix[] = {'D','E','S',0}; + static const WCHAR avi[] = {'a','v','i',0}; HRSRC res; HGLOBAL data; char *mem;

1 0

Bruno Jesus : ws2_32: Add support to check if an IPX socket is bound.
by Alexandre Julliard Dec. 30, 2013

Dec. 30, 2013

Module: wine Branch: master Commit: ae728cfa274e3517f38a9fe21c9b738c43b1ad73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae728cfa274e3517f38a9fe21… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 27 18:32:29 2013 -0200 ws2_32: Add support to check if an IPX socket is bound. --- dlls/ws2_32/socket.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1d79b74..36f2ac4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1427,8 +1427,11 @@ static BOOL is_sockaddr_bound(const struct sockaddr *uaddr, int uaddrlen) { #ifdef HAS_IPX case AF_IPX: - FIXME("don't know how to tell if IPX socket is bound, assuming it is!\n"); - return TRUE; + { + static const struct sockaddr_ipx emptyAddr; + struct sockaddr_ipx *ipx = (struct sockaddr_ipx*) uaddr; + return ipx->sipx_port || ipx->sipx_network || memcmp(&ipx->sipx_node, &emptyAddr.sipx_node, sizeof(emptyAddr.sipx_node)); + } #endif case AF_INET6: {

1 0

Ing. Simone Giustetti : The Slackware release number was upgraded to 14.1
by Jeremy Newman Dec. 30, 2013

Dec. 30, 2013

Module: website Branch: master Commit: 2ffe7a880e80fefa34d4caea9fda2842628bbc06 URL: http://source.winehq.org/git/website.git/?a=commit;h=2ffe7a880e80fefa34d4ca… Author: Ing. Simone Giustetti <studiosg(a)giustetti.net> Date: Mon Dec 23 14:49:54 2013 +0100 The Slackware release number was upgraded to 14.1 --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/pl/download.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 0f93af7..35af807 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -104,7 +104,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Slackware</a> - binär txz (Slackware 14.0), und tgz (für ältere Versionen)</td> + binär txz (Slackware 14.1), und tgz (für ältere Versionen)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index ec1f7fa..c51ebd4 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -103,7 +103,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Download Slackware packages</a> - - binary txz (Slackware 14.0), and tgz (for older versions)</td> + - binary txz (Slackware 14.1), and tgz (for older versions)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index 0389781..8677511 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -103,7 +103,7 @@ <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware Packages/">Pobierz paczki dla Slackware</a> - - binarne paczki txz (Slackware 14.0), i tgz (dla starszych wersji)</td> + - binarne paczki txz (Slackware 14.1), i tgz (dla starszych wersji)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr>

1 0

André Hentschel : Wine 1.7.9 freigegeben
by Jeremy Newman Dec. 30, 2013

Dec. 30, 2013

Module: website Branch: master Commit: 7ab0c3fa55e46748d89620ffab2c84dec296d7c4 URL: http://source.winehq.org/git/website.git/?a=commit;h=7ab0c3fa55e46748d89620… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 21 14:37:30 2013 +0100 Wine 1.7.9 freigegeben --- news/de/2013122001.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2013122001.xml b/news/de/2013122001.xml new file mode 100644 index 0000000..3d788d8 --- /dev/null +++ b/news/de/2013122001.xml @@ -0,0 +1,15 @@ +<news> +<date>20. Dezember 2013</date> +<title>Wine 1.7.9 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.9 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.9">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserung des Verschieben/der Größenanpassung von Fenstern im Mac Treiber.</li> + <li>Einige Fehlerbehebungen an den DirectDraw Farbskalen.</li> + <li>Weniger Code Duplication zwischen C++ Laufzeit Versionen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.9.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

刘涛 : website: Update Simplified Chinese translation for ubuntu download page
by Jeremy Newman Dec. 30, 2013

Dec. 30, 2013

Module: website Branch: master Commit: a3796add2e637480ef1d58d11833992d550924b7 URL: http://source.winehq.org/git/website.git/?a=commit;h=a3796add2e637480ef1d58… Author: 刘涛 <wendaotao(a)163.com> Date: Fri Dec 20 17:01:01 2013 +0800 website: Update Simplified Chinese translation for ubuntu download page --- templates/zh-cn/download/ubuntu.template | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/zh-cn/download/ubuntu.template b/templates/zh-cn/download/ubuntu.template index fd150d4..84722db 100644 --- a/templates/zh-cn/download/ubuntu.template +++ b/templates/zh-cn/download/ubuntu.template @@ -22,21 +22,21 @@ Ubuntu 的源默认包含了 Wine，当然，如果你想更新到最新版本 <h2>警告：Beta 版安装包</h2> -版本 1.5 的安装包是 beta 版的安装包。这意味着他们可能偶尔遭受<a href="http://wiki.winehq.org/Regression">倒退（regressions）</a>，结果是一个更新可能破坏 Wine 的（原有）功能。 -所以，如果稳定版的 Wine 1.4 已经能够为你工作，你或许不太想用 beta 版的安装包。 +版本 1.7 的安装包是 beta 版的安装包。这意味着他们可能偶尔遭受<a href="http://wiki.winehq.org/Regression">退化（regressions）</a>，结果是一个更新可能破坏 Wine 的（原有）功能。 +所以，如果稳定版的 Wine 1.6 已经能够为你工作，你或许不太想用 beta 版的安装包。 <h2>安装 Wine：</h2> 一旦你已经添加了 WineHQ PPA 源，你就已经可以开始安装了。 -获取最新的 Wine 1.5 beta， -<a href="apt://wine1.5">点击这个链接来安装 wine1.5 的安装包</a>。 -安装旧版但稳定的 Wine 1.4， -<a href="apt://wine1.4">点击这个链接来安装 wine1.4 的安装包</a>。 +获取最新的 Wine 1.7 beta， +<a href="apt://wine1.7">点击这个链接来安装 wine1.7 的安装包</a>。 +安装旧版但稳定的 Wine 1.6， +<a href="apt://wine1.6">点击这个链接来安装 wine1.6 的安装包</a>。 <h2>更新 Ubuntu 到一个新的版本</h2> -如果你更新了整个系统，比如从 Ubuntu 11.10 到 12.04，你需要回到这个页面并重新添加软件源。内置的更新管理器是不会自动开启 Wine 源的。 +如果你更新了整个系统，比如从 Ubuntu 13.10 到 14.04，你需要回到这个页面并重新添加软件源。内置的更新管理器是不会自动开启 Wine 源的。 <h2>使用命令行来安装 Wine：</h2> @@ -46,6 +46,6 @@ Ubuntu 的源默认包含了 Wine，当然，如果你想更新到最新版本 接着运行 ‘sudo apt-get update’ 来更新 APT 的包信息。现在你就可以使用 ‘sudo apt-get -install wine1.5’ 来安装 Wine 了。 +install wine1.7’ 来安装 Wine 了。 如果你想亲自浏览 PPA，可以<a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">访问它的 Launchpad 页面</a>。

1 0

刘涛 : website: Update Simplified Chinese translation for download page
by Jeremy Newman Dec. 30, 2013

Dec. 30, 2013

Module: website Branch: master Commit: 963dea61095c8113b9c6cd25ffd0016bd094eccb URL: http://source.winehq.org/git/website.git/?a=commit;h=963dea61095c8113b9c6cd… Author: 刘涛 <wendaotao(a)163.com> Date: Fri Dec 20 16:58:50 2013 +0800 website: Update Simplified Chinese translation for download page --- templates/zh-cn/download.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 80f46fe..2cbdee1 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux"border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">下载 Ubuntu 安装包</a> - - Ubuntu Oneiric（11.10），和 Precise（12.04）的二进制和源码 .debs + - Ubuntu Oneiric（11.10), Precise（12.04）和 Saucy（13.10）的二进制和源码 .debs <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr>

1 0

Andrey Gusev : Ukrainian translation update for Ubuntu download page
by Jeremy Newman Dec. 30, 2013

Dec. 30, 2013

Module: website Branch: master Commit: 50d439dc12f0c1608637edfa89c45a9fc8b94e29 URL: http://source.winehq.org/git/website.git/?a=commit;h=50d439dc12f0c1608637ed… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 20 11:44:52 2013 +0200 Ukrainian translation update for Ubuntu download page --- templates/uk/download/ubuntu.template | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/uk/download/ubuntu.template b/templates/uk/download/ubuntu.template index 3097267..f346996 100644 --- a/templates/uk/download/ubuntu.template +++ b/templates/uk/download/ubuntu.template @@ -24,22 +24,22 @@ Software tab and click Add. <h2>Попередження: Розробницькі пакунки</h2> -Пакунки версії 1.5 це розробницькі пакунки. Це означає, що вони періодично можуть містити +Пакунки версії 1.7 це розробницькі пакунки. Це означає, що вони періодично можуть містити <a href="http://wiki.winehq.org/Regression">регресії</a>, і в разі оновлень може постраждати функціональність. -Якщо версія 1.4 добре працює, тоді ви можете не використовувати ці розробницькі пакунки. +Якщо версія 1.6 добре працює, тоді ви можете не використовувати ці розробницькі пакунки. <h2>Встановлення Wine:</h2> Після додавання репозиторія WineHQ PPA, ви готові до встановлення Wine. -Щоб встановити найсвіжішу розробницьку версію Wine 1.5, -<a href="apt://wine1.5">клікніть на це посилання</a>. -Щоб встановити стабільну версію Wine 1.4, -<a href="apt://wine1.4">клікніть на це посилання</a>. +Щоб встановити найсвіжішу розробницьку версію Wine 1.7, +<a href="apt://wine1.7">клікніть на це посилання</a>. +Щоб встановити стабільну версію Wine 1.6, +<a href="apt://wine1.6">клікніть на це посилання</a>. <h2>Оновлення до нової версії Ubuntu</h2> -Якщо ви оновили систему з Ubuntu 11.10 до 12.04, вам потрібно знову додати репозиторій. +Якщо ви оновили систему з Ubuntu 13.10 до 14.04, вам потрібно знову додати репозиторій. Вбудований менеджер оновлень не перемикає репозиторій Wine автоматично. @@ -52,6 +52,6 @@ Kubuntu, Xubuntu та інших дистрибутивах Ubuntu. Потім оновіть APT запустивши команду 'sudo apt-get update'. Тепер ви можете встановити Wine набравши команду 'sudo apt-get -install wine1.5'. +install wine1.7'. Якщо ви хочете подивитися репозиторій власноруч, перейдіть на <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">сторінку у Launchpad</a>.

1 0