December 2010 - Wine-commits

Henri Verbeet : wined3d: shader_get_registers_used() is only called during shader initialization.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 6a646ac25d55b20e41f2a554d374274c200811e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a646ac25d55b20e41f2a554d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 3 00:55:48 2010 +0100 wined3d: shader_get_registers_used() is only called during shader initialization. --- dlls/wined3d/shader.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 25ed2cf..ef6816f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -461,13 +461,6 @@ static HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct memset(reg_maps, 0, sizeof(*reg_maps)); reg_maps->min_rel_offset = ~0U; - /* get_registers_used() is called on every compile on some 1.x shaders, - * which can result in stacking up a collection of local constants. - * Delete the old constants if existing. */ - shader_delete_constant_list(&shader->baseShader.constantsF); - shader_delete_constant_list(&shader->baseShader.constantsB); - shader_delete_constant_list(&shader->baseShader.constantsI); - fe->shader_read_header(fe_data, &ptr, &shader_version); reg_maps->shader_version = shader_version;

1 0

Thomas Mullaly : urlmon: Implemented PARSE_PATH_FROM_URL for CoInternetParseIUri.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 221331e72b8193ca2b13ace352a7ad41e804681d URL: http://source.winehq.org/git/wine.git/?a=commit;h=221331e72b8193ca2b13ace35… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Nov 30 20:28:36 2010 -0500 urlmon: Implemented PARSE_PATH_FROM_URL for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 9 +++++- dlls/urlmon/uri.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 706e8b5..01a0f5a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5941,7 +5941,14 @@ static const uri_parse_test uri_parse_tests[] = { {"file:///c:/test#frag",0,PARSE_DOCUMENT,0,"",S_OK,FALSE}, {"zip://google.com/#frag",0,PARSE_DOCUMENT,0,"",S_OK,FALSE}, {"zip:test#frag",0,PARSE_DOCUMENT,0,"",S_OK,FALSE}, - {"testing#frag",Uri_CREATE_ALLOW_RELATIVE,PARSE_DOCUMENT,0,"",S_OK,FALSE} + {"testing#frag",Uri_CREATE_ALLOW_RELATIVE,PARSE_DOCUMENT,0,"",S_OK,FALSE}, + + /* PARSE_PATH_FROM_URL tests. */ + {"file:///c:/test.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\test.mp3",S_OK,FALSE}, + {"file:///c:/t<|>est.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\t<|>est.mp3",S_OK,FALSE}, + {"file:///c:/te%XX t/",0,PARSE_PATH_FROM_URL,0,"c:\\te%XX t\\",S_OK,FALSE}, + {"file://server/test",0,PARSE_PATH_FROM_URL,0,"\\\\server\\test",S_OK,FALSE}, + {"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 4247c71..b09a165 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6298,6 +6298,64 @@ static HRESULT parse_document(const Uri *uri, LPWSTR output, DWORD output_len, return S_OK; } +static HRESULT parse_path_from_url(const Uri *uri, LPWSTR output, DWORD output_len, + DWORD *result_len) +{ + const WCHAR *path_ptr; + WCHAR buffer[INTERNET_MAX_URL_LENGTH+1]; + WCHAR *ptr; + + if(uri->scheme_type != URL_SCHEME_FILE) { + *result_len = 0; + if(output_len > 0) + output[0] = 0; + return E_INVALIDARG; + } + + ptr = buffer; + if(uri->host_start > -1) { + static const WCHAR slash_slashW[] = {'\\','\\'}; + + memcpy(ptr, slash_slashW, sizeof(slash_slashW)); + ptr += sizeof(slash_slashW)/sizeof(WCHAR); + memcpy(ptr, uri->canon_uri+uri->host_start, uri->host_len*sizeof(WCHAR)); + ptr += uri->host_len; + } + + path_ptr = uri->canon_uri+uri->path_start; + if(uri->path_len > 3 && *path_ptr == '/' && is_drive_path(path_ptr+1)) + /* Skip past the '/' in front of the drive path. */ + ++path_ptr; + + for(; path_ptr < uri->canon_uri+uri->path_start+uri->path_len; ++path_ptr, ++ptr) { + BOOL do_default_action = TRUE; + + if(*path_ptr == '%') { + const WCHAR decoded = decode_pct_val(path_ptr); + if(decoded) { + *ptr = decoded; + path_ptr += 2; + do_default_action = FALSE; + } + } else if(*path_ptr == '/') { + *ptr = '\\'; + do_default_action = FALSE; + } + + if(do_default_action) + *ptr = *path_ptr; + } + + *ptr = 0; + + *result_len = ptr-buffer; + if(*result_len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + memcpy(output, buffer, (*result_len+1)*sizeof(WCHAR)); + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6350,6 +6408,15 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d } hr = parse_document(uri, pwzResult, cchResult, pcchResult); break; + case PARSE_PATH_FROM_URL: + if(!(uri = get_uri_obj(pIUri))) { + *pcchResult = 0; + FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", + pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); + return E_NOTIMPL; + } + hr = parse_path_from_url(uri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Thomas Mullaly : urlmon: Implemented PARSE_URL_FROM_PATH for CoInternetParseIUri.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 17880993217ab52d1771bcc5af717186ec0a77fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=17880993217ab52d1771bcc5a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Dec 2 20:58:11 2010 -0500 urlmon: Implemented PARSE_URL_FROM_PATH for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 10 +++++++++- dlls/urlmon/uri.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 01a0f5a..b135c10 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5948,7 +5948,15 @@ static const uri_parse_test uri_parse_tests[] = { {"file:///c:/t<|>est.mp3",0,PARSE_PATH_FROM_URL,0,"c:\\t<|>est.mp3",S_OK,FALSE}, {"file:///c:/te%XX t/",0,PARSE_PATH_FROM_URL,0,"c:\\te%XX t\\",S_OK,FALSE}, {"file://server/test",0,PARSE_PATH_FROM_URL,0,"\\\\server\\test",S_OK,FALSE}, - {"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE} + {"http://google.com/",0,PARSE_PATH_FROM_URL,0,"",E_INVALIDARG,FALSE}, + + /* PARSE_URL_FROM_PATH tests. */ + /* This function almost seems to useless (just returns the absolute uri). */ + {"test.com",Uri_CREATE_ALLOW_RELATIVE,PARSE_URL_FROM_PATH,0,"test.com",S_OK,FALSE}, + {"/test/test",Uri_CREATE_ALLOW_RELATIVE,PARSE_URL_FROM_PATH,0,"/test/test",S_OK,FALSE}, + {"file://c:\\test\\test",Uri_CREATE_FILE_USE_DOS_PATH,PARSE_URL_FROM_PATH,0,"file://c:\\test\\test",S_OK,FALSE}, + {"file:c:/test",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE}, + {"http:google.com/",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index b09a165..e409ebc 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6356,6 +6356,35 @@ static HRESULT parse_path_from_url(const Uri *uri, LPWSTR output, DWORD output_l return S_OK; } +static HRESULT parse_url_from_path(IUri *uri, LPWSTR output, DWORD output_len, + DWORD *result_len) +{ + HRESULT hr; + BSTR received; + DWORD len = 0; + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_ABSOLUTE_URI, &len, 0); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + *result_len = len; + if(len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + hr = IUri_GetAbsoluteUri(uri, &received); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + memcpy(output, received, (len+1)*sizeof(WCHAR)); + SysFreeString(received); + + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6417,6 +6446,9 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d } hr = parse_path_from_url(uri, pwzResult, cchResult, pcchResult); break; + case PARSE_URL_FROM_PATH: + hr = parse_url_from_path(pIUri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Thomas Mullaly : urlmon: Implemented PARSE_SCHEMA for CoInternetParseIUri.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: a77f159019c9814ee2379966d5b77e03a729e5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77f159019c9814ee2379966d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Dec 2 21:22:50 2010 -0500 urlmon: Implemented PARSE_SCHEMA for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 6 +++++- dlls/urlmon/uri.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b135c10..9ec7288 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5956,7 +5956,11 @@ static const uri_parse_test uri_parse_tests[] = { {"/test/test",Uri_CREATE_ALLOW_RELATIVE,PARSE_URL_FROM_PATH,0,"/test/test",S_OK,FALSE}, {"file://c:\\test\\test",Uri_CREATE_FILE_USE_DOS_PATH,PARSE_URL_FROM_PATH,0,"file://c:\\test\\test",S_OK,FALSE}, {"file:c:/test",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE}, - {"http:google.com/",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE} + {"http:google.com/",0,PARSE_URL_FROM_PATH,0,"",S_OK,FALSE}, + + /* PARSE_SCHEMA tests. */ + {"http://google.com/test",0,PARSE_SCHEMA,0,"http",S_OK,FALSE}, + {"test",Uri_CREATE_ALLOW_RELATIVE,PARSE_SCHEMA,0,"",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e409ebc..04cffb1 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6385,6 +6385,35 @@ static HRESULT parse_url_from_path(IUri *uri, LPWSTR output, DWORD output_len, return S_OK; } +static HRESULT parse_schema(IUri *uri, LPWSTR output, DWORD output_len, + DWORD *result_len) +{ + HRESULT hr; + DWORD len; + BSTR received; + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_SCHEME_NAME, &len, 0); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + *result_len = len; + if(len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + hr = IUri_GetSchemeName(uri, &received); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + memcpy(output, received, (len+1)*sizeof(WCHAR)); + SysFreeString(received); + + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6449,6 +6478,9 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d case PARSE_URL_FROM_PATH: hr = parse_url_from_path(pIUri, pwzResult, cchResult, pcchResult); break; + case PARSE_SCHEMA: + hr = parse_schema(pIUri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Thomas Mullaly : urlmon: Implemented PARSE_SITE for CoInternetParseIUri.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 500e4fae7ceb7c03a56da39ef222d8731d4b1c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500e4fae7ceb7c03a56da39ef… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Dec 2 21:32:43 2010 -0500 urlmon: Implemented PARSE_SITE for CoInternetParseIUri. --- dlls/urlmon/tests/uri.c | 8 +++++++- dlls/urlmon/uri.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9ec7288..057850a 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5960,7 +5960,13 @@ static const uri_parse_test uri_parse_tests[] = { /* PARSE_SCHEMA tests. */ {"http://google.com/test",0,PARSE_SCHEMA,0,"http",S_OK,FALSE}, - {"test",Uri_CREATE_ALLOW_RELATIVE,PARSE_SCHEMA,0,"",S_OK,FALSE} + {"test",Uri_CREATE_ALLOW_RELATIVE,PARSE_SCHEMA,0,"",S_OK,FALSE}, + + /* PARSE_SITE tests. */ + {"http://google.uk.com/",0,PARSE_SITE,0,"google.uk.com",S_OK,FALSE}, + {"http://google.com.com/",0,PARSE_SITE,0,"google.com.com",S_OK,FALSE}, + {"google.com",Uri_CREATE_ALLOW_RELATIVE,PARSE_SITE,0,"",S_OK,FALSE}, + {"file://server/test",0,PARSE_SITE,0,"server",S_OK,FALSE} }; static inline LPWSTR a2w(LPCSTR str) { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 04cffb1..54f7118 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6414,6 +6414,34 @@ static HRESULT parse_schema(IUri *uri, LPWSTR output, DWORD output_len, return S_OK; } +static HRESULT parse_site(IUri *uri, LPWSTR output, DWORD output_len, DWORD *result_len) +{ + HRESULT hr; + DWORD len; + BSTR received; + + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_HOST, &len, 0); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + *result_len = len; + if(len+1 > output_len) + return STRSAFE_E_INSUFFICIENT_BUFFER; + + hr = IUri_GetHost(uri, &received); + if(FAILED(hr)) { + *result_len = 0; + return hr; + } + + memcpy(output, received, (len+1)*sizeof(WCHAR)); + SysFreeString(received); + + return S_OK; +} + /*********************************************************************** * CoInternetParseIUri (urlmon.@) */ @@ -6481,6 +6509,9 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d case PARSE_SCHEMA: hr = parse_schema(pIUri, pwzResult, cchResult, pcchResult); break; + case PARSE_SITE: + hr = parse_site(pIUri, pwzResult, cchResult, pcchResult); + break; case PARSE_SECURITY_URL: case PARSE_MIME: case PARSE_SERVER:

1 0

Cheer Xiao : winhlp32: Update Simplified Chinese translation.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 6e6c66b2398d4250c9a2f4cab8268d43a7bb583f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6c66b2398d4250c9a2f4cab… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:21:02 2010 +0800 winhlp32: Update Simplified Chinese translation. (cherry picked from commit 2d728e4c04e23b8835ba01d2a678ea76c0976cdd) --- programs/winhlp32/Zh.rc | 56 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 48 insertions(+), 8 deletions(-) diff --git a/programs/winhlp32/Zh.rc b/programs/winhlp32/Zh.rc index 089323a..cacdf51 100644 --- a/programs/winhlp32/Zh.rc +++ b/programs/winhlp32/Zh.rc @@ -4,6 +4,7 @@ * * Copyright 2002 liuspider <liuspider(a)yahoo.com> * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,7 +38,7 @@ MAIN_MENU MENU MENUITEM "打印(&P)", MNID_FILE_PRINT MENUITEM "打印机设置(&S)...", MNID_FILE_SETUP MENUITEM SEPARATOR - MENUITEM "退出(&E)", MNID_FILE_EXIT + MENUITEM "退出(&X)", MNID_FILE_EXIT } POPUP "编辑(&E)" { MENUITEM "复制(&C)...", MNID_EDIT_COPYDLG @@ -48,7 +49,7 @@ MAIN_MENU MENU MENUITEM "定义(&D)...", MNID_BKMK_DEFINE } POPUP "选项(&O)" { - POPUP "显示帮助" + POPUP "总是显示帮助" BEGIN MENUITEM "默认", MNID_OPTS_HELP_DEFAULT MENUITEM "显示", MNID_OPTS_HELP_VISIBLE @@ -67,10 +68,26 @@ MAIN_MENU MENU MENUITEM "如何使用帮助(&O)", MNID_HELP_HELPON MENUITEM "总是在最前面(&T)", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "资料信息(&I)...", MNID_HELP_ABOUT + MENUITEM "关于 Wine 帮助(&I)...", MNID_HELP_ABOUT } } +IDD_INDEX DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "索引" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER +} + +IDD_SEARCH DIALOG 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "搜索" +{ + LTEXT "尚未实现", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE { @@ -79,17 +96,40 @@ STID_WHERROR, "错误" STID_WARNING, "警告" STID_INFO, "信息" STID_NOT_IMPLEMENTED, "未实现" -STID_HLPFILE_ERROR_s, "读入帮助文件 ‘%s’ 时发生错误" -STID_INDEX, "内容(&C)" +STID_HLPFILE_ERROR_s, "读入帮助文件“%s”时发生错误" +STID_INDEX, "索引(&I)" STID_CONTENTS, "概要" STID_BACK, "返回(&B)" STID_ALL_FILES, "所有文件 (*.*)" STID_HELP_FILES_HLP, "帮助文件 (*.hlp)" -STID_FILE_NOT_FOUND_s "不能打开文件 '%s'. 你想要自己找这个文件吗?" -STID_NO_RICHEDIT "找不到 richedit... 终止" -STID_PSH_INDEX, "帮助内容: " +STID_FILE_NOT_FOUND_s "找不到文件“%s”。你想要自己找这个文件吗？" +STID_NO_RICHEDIT "找不到 richedit 的实现……终止" +STID_PSH_INDEX, "帮助主题：" } +CONTEXT_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "注释...", MNID_CTXT_ANNOTATE + MENUITEM "复制", MNID_CTXT_COPY + MENUITEM "打印...", MNID_CTXT_PRINT + POPUP "字体" + BEGIN + MENUITEM "小号", MNID_CTXT_FONTS_SMALL + MENUITEM "中号", MNID_CTXT_FONTS_NORMAL + MENUITEM "大号", MNID_CTXT_FONTS_LARGE + END + POPUP "总是显示帮助" + BEGIN + MENUITEM "默认", MNID_CTXT_HELP_DEFAULT + MENUITEM "显示", MNID_CTXT_HELP_VISIBLE + MENUITEM "不显示", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "使用系统颜色", MNID_CTXT_SYSTEM_COLORS + END +END + LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL /* Menu */

1 0

Cheer Xiao : wordpad: Update Simplified Chinese translation.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: ec27e91e699d441109925fd8f1072cbae94f05a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec27e91e699d441109925fd8f… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:21:58 2010 +0800 wordpad: Update Simplified Chinese translation. (cherry picked from commit 5ee61dd51da2a9028716d9dd11cd5c60ea0cca2e) --- programs/wordpad/Zh.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/Zh.rc b/programs/wordpad/Zh.rc index 663cc1d..3b7b4f3 100644 --- a/programs/wordpad/Zh.rc +++ b/programs/wordpad/Zh.rc @@ -61,7 +61,7 @@ BEGIN MENUITEM SEPARATOR POPUP "其他(&X)" BEGIN - MENUITEM "选中信息(&I)", ID_EDIT_SELECTIONINFO + MENUITEM "选中信息(&I)", ID_EDIT_SELECTIONINFO /* 准确性待议 */ MENUITEM "文字格式(&F)", ID_EDIT_CHARFORMAT MENUITEM "默认格式(&D)", ID_EDIT_DEFCHARFORMAT MENUITEM "段落格式(&H)", ID_EDIT_PARAFORMAT @@ -118,7 +118,7 @@ BEGIN BEGIN MENUITEM "黑色", ID_COLOR_BLACK /* 未找到“标准译名表” */ MENUITEM "栗色", ID_COLOR_MAROON - MENUITEM "调和绿", ID_COLOR_GREEN + MENUITEM "绿色", ID_COLOR_GREEN MENUITEM "橄榄色" ID_COLOR_OLIVE MENUITEM "藏青" ID_COLOR_NAVY MENUITEM "紫色" ID_COLOR_PURPLE @@ -126,7 +126,7 @@ BEGIN MENUITEM "灰色" ID_COLOR_GRAY MENUITEM "银色" ID_COLOR_SILVER MENUITEM "红色" ID_COLOR_RED - MENUITEM "绿色" ID_COLOR_LIME + MENUITEM "青柠色" ID_COLOR_LIME MENUITEM "黄色" ID_COLOR_YELLOW MENUITEM "蓝色" ID_COLOR_BLUE MENUITEM "洋红" ID_COLOR_FUCHSIA /* =magenta? */

1 0

Cheer Xiao : notepad: Update Simplified Chinese translation.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 6961063aaacb75587d12fa3a334352e91e6e220f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6961063aaacb75587d12fa3a3… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:46:45 2010 +0800 notepad: Update Simplified Chinese translation. (cherry picked from commit ecbcf8b137a49da3aaf2761bfa80f400c6a82468) --- programs/notepad/Zh.rc | 52 +++++++++++++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 20 deletions(-) diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index dbc4430..94ac3f4 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -3,6 +3,7 @@ * * Copyright 2002 liuspider <liuspider(a)yahoo.com> * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -74,19 +75,19 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 9, "MS Shell Dlg" CAPTION "页面设置" { -LTEXT "页眉(&H):", 0x140, 10, 07, 40, 15 +LTEXT "页眉(&H)：", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP -LTEXT "脚注(&F):", 0x142, 10, 24, 40, 15 +LTEXT "页脚(&F)：", 0x142, 10, 24, 40, 15 EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP -GROUPBOX "边缘空白(&M):", 0x144, 10, 43,160, 45 -LTEXT "左(&L):", 0x145, 20, 55, 30, 10, WS_CHILD +GROUPBOX "边距（毫米）(&M)：", 0x144, 10, 43,160, 45 +LTEXT "左(&L)：", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "上(&T):", 0x148, 20, 73, 30, 10, WS_CHILD +LTEXT "上(&T)：", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "右(&R):", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "右(&R)：", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "下(&B):", 0x14E,100, 73, 30, 10, WS_CHILD +LTEXT "下(&B)：", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "确定", IDOK, 180, 3, 40, 15, WS_TABSTOP @@ -94,33 +95,44 @@ PUSHBUTTON "取消", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "帮助(&H)", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG 50,50,300,15 +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 9, "MS Shell Dlg" +BEGIN + LTEXT "编码：", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED { STRING_PAGESETUP_HEADERVALUE, "&f" -STRING_PAGESETUP_FOOTERVALUE, "&p 页" +STRING_PAGESETUP_FOOTERVALUE, "第 &p 页" STRING_NOTEPAD, "记事本" STRING_ERROR, "错误" STRING_WARNING, "警告" STRING_INFO, "信息" -STRING_UNTITLED, "(未命名)" +STRING_UNTITLED, "（未命名）" STRING_ALL_FILES, "所有文件 (*.*)" STRING_TEXT_FILES_TXT, "文本文件 (*.txt)" -STRING_TOOLARGE, "记事本不能打开 '%s' 这么大的文件。\n \ -请使用别的编辑器。" -STRING_NOTEXT, "您没有输入任何文本。 \ -\n请输入一些再试" -STRING_DOESNOTEXIST, "文件 '%s'\n不存在\n\n \ -您想新建一个文件吗？" -STRING_NOTSAVED, "文件 '%s'\n正文已更改\n\n \ -是否保存更改？" -STRING_NOTFOUND, "找不到: '%s'" -STRING_OUT_OF_MEMORY, "没有足够的内存可以用来完成此项任务。 \ -\n请关闭一些程序后再试。" +STRING_TOOLARGE, "记事本不能打开“%s“这么大的文件。\n请使用别的编辑器。" +STRING_NOTEXT, "您没有输入任何文本。\n请输入一些再试。" +STRING_DOESNOTEXIST, "文件“%s”不存在。\n\n您想新建一个文件吗？" +STRING_NOTSAVED, "文件“%s”已更改。\n\n是否保存更改？" +STRING_NOTFOUND, "找不到“%s”。" +STRING_OUT_OF_MEMORY, "没有足够的内存可以用来完成此项任务。请关闭一些程序后再试。" + +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 大尾)" +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +此文件包含 Unicode 字符。如果用 %s 编码保存，这些字符将会丢失。\n\ +要保留这些字符，请点“取消”，然后选择一种 Unicode 编码。\n\ +要继续吗？" } LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

1 0

Austin English : appwiz.cpl: Fix Italian translation.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 3e6153280026ab9be402d458b79890145b685862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e6153280026ab9be402d458b… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Nov 20 14:13:14 2010 +0100 appwiz.cpl: Fix Italian translation. (cherry picked from commit 6d56678fbe875cc266e2075006e8e99056771e7d) --- dlls/appwiz.cpl/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/It.rc b/dlls/appwiz.cpl/It.rc index dd0299f..b09cd91 100644 --- a/dlls/appwiz.cpl/It.rc +++ b/dlls/appwiz.cpl/It.rc @@ -28,7 +28,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { - IDS_CPL_TITLE, "Agiungi/Rimuovi Programmi" + IDS_CPL_TITLE, "Aggiungi/Rimuovi Programmi" IDS_CPL_DESC, "Ti permette di installare nuovi software o di rimuovere quelli presenti dal tuo computer." IDS_TAB1_TITLE, "Applicazioni"

1 0

Luca Bennati : xcopy: Fix Italian translation.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: stable Commit: 915162d2de393dd7a47d9e5517fe066cd0a3386d URL: http://source.winehq.org/git/wine.git/?a=commit;h=915162d2de393dd7a47d9e551… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Nov 20 21:26:58 2010 +0100 xcopy: Fix Italian translation. (cherry picked from commit 1c24b643fff703ca6b4ae8d1f2efef0ff0a802ac) --- programs/xcopy/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/xcopy/It.rc b/programs/xcopy/It.rc index 2978c0d..2a1cae9 100644 --- a/programs/xcopy/It.rc +++ b/programs/xcopy/It.rc @@ -34,7 +34,7 @@ STRINGTABLE STRING_SIMCOPY, "%d file saranno copiati\n" STRING_COPY, "%d file copiato/i\n" STRING_QISDIR, "'%s' è il nome di un file o una cartella\n\ - nell'obiettivo?\n\ + nella destinazione?\n\ (F - File, C - Cartella)\n" STRING_SRCPROMPT,"%s? (Sì|No)\n" STRING_OVERWRITE,"Sovrascrivere %s? (Sì|No|Tutti)\n"

1 0