November 2010 - Wine-Commits

Cheer Xiao : notepad: Update Simplified Chinese translation.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: ecbcf8b137a49da3aaf2761bfa80f400c6a82468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbcf8b137a49da3aaf2761bf… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:46:45 2010 +0800 notepad: Update Simplified Chinese translation. --- programs/notepad/Zh.rc | 51 +++++++++++++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 20 deletions(-) diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index 69d42ae..51269e3 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 @@ -75,19 +76,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 @@ -95,33 +96,43 @@ 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 +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 { 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

Cheer Xiao : winhlp32: Update Simplified Chinese translation.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 2d728e4c04e23b8835ba01d2a678ea76c0976cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d728e4c04e23b8835ba01d2a… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:21:02 2010 +0800 winhlp32: Update Simplified Chinese translation. --- 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 f9d2746..2532cb3 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 { @@ -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 : wineconsole: Update Simplified Chinese translation.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 769031ed7e250b15a1fc021afd156548ae4fca16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=769031ed7e250b15a1fc021af… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:20:48 2010 +0800 wineconsole: Update Simplified Chinese translation. --- programs/wineconsole/wineconsole_Zh.rc | 45 +++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/programs/wineconsole/wineconsole_Zh.rc b/programs/wineconsole/wineconsole_Zh.rc index 9e79299..2267e3e 100644 --- a/programs/wineconsole/wineconsole_Zh.rc +++ b/programs/wineconsole/wineconsole_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 @@ -29,7 +30,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN IDS_EDIT, "编辑(&E)" -IDS_DEFAULT, "设为默认值(&D)" +IDS_DEFAULT, "设置默认值(&D)" IDS_PROPERTIES, "属性(&P)" IDS_MARK, "标记(&M)" IDS_COPY, "复制(&C)" @@ -37,12 +38,26 @@ IDS_PASTE, "粘贴(&P)" IDS_SELECTALL, "全选(&S)" IDS_SCROLL, "滚动(&R)" IDS_SEARCH, "搜索(&E)" -IDS_FNT_DISPLAY, "每个字都是 %ld 个像素宽，%ld 个像素高" -IDS_FNT_PREVIEW, "这是一段测试语句" +IDS_FNT_DISPLAY, "每个字符都是 %ld 像素宽，%ld 像素高" +IDS_FNT_PREVIEW, "This is a test 这是测试" IDS_DLG_TIT_DEFAULT, "配置 - 默认设置" IDS_DLG_TIT_CURRENT, "配置 - 当前设置" IDS_DLG_TIT_ERROR, "配置错误" -IDS_DLG_ERR_SBWINSIZE, "屏幕缓存大小必须大于或等于视窗缓存" +IDS_DLG_ERR_SBWINSIZE, "屏幕缓冲区大小必须不小于窗口" + +IDS_CMD_INVALID_EVENT_ID "wineconsole: 无法解析事件 id\n" +IDS_CMD_INVALID_BACKEND "wineconsole: 无效后端\n" +IDS_CMD_INVALID_OPTION "wineconsole: 命令行选项错误\n" +IDS_CMD_ABOUT "在 Wine 控制台中运行程序\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: 无法启动程序 %s。\n"\ + "命令无效。\n" + +IDS_USAGE_HEADER "\n用法：\n wineconsole [options] <command>\n\n选项：\n" +IDS_USAGE_BACKEND " --backend={user|curses} 选 user 会打开新窗口；选 curses 会试图在当前\n"\ + " 终端中运行 Wine 控制台\n" +IDS_USAGE_COMMAND " <command> 要在控制台运行的 Wine 程序\n" +IDS_USAGE_FOOTER "\n示例：\n wineconsole cmd\n在 Wine 控制台中运行 Wine 命令行\n\n" + END IDD_OPTION DIALOG 36, 24, 140, 105 @@ -62,8 +77,8 @@ FONT 9, "MS Shell Dlg" LTEXT "快速编辑", -1, 79, 43, 50, 10 AUTOCHECKBOX "启用(&E)", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP - GROUPBOX "历史命令", -1, 10, 57, 190, 35, BS_GROUPBOX - LTEXT "最大记录命令数:", -1, 14, 67, 78, 18 + GROUPBOX "命令历史", -1, 10, 57, 190, 35, BS_GROUPBOX + LTEXT "最大记录命令数：", -1, 14, 67, 78, 18 EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 AUTOCHECKBOX "删除连续相同的命令(&R)", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE @@ -90,36 +105,36 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " 配置 " FONT 9, "MS Shell Dlg" { - GROUPBOX "缓冲区域", -1, 10, 11, 100, 42, BS_GROUPBOX - LTEXT "宽度(&W):", -1, 14, 25, 54, 9 + GROUPBOX "缓冲区", -1, 10, 11, 100, 42, BS_GROUPBOX + LTEXT "宽度(&W)：", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "高度(&H):", -1, 14, 39, 54, 9 + LTEXT "高度(&H)：", -1, 14, 39, 54, 9 EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 GROUPBOX "窗口大小", -1, 10, 55, 100, 42 - LTEXT "宽度(&I):", -1, 14, 69, 54, 9 + LTEXT "宽度(&I)：", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "高度(&E):", -1, 14, 83, 54, 9 + LTEXT "高度(&E)：", -1, 14, 83, 54, 9 EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 GROUPBOX "当程序退出后", -1, 115, 11, 80, 42, BS_GROUPBOX - AUTOCHECKBOX "关闭虚拟终端(&C)", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP + AUTOCHECKBOX "关闭控制台(&C)", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP - GROUPBOX "Edition", -1, 115, 55, 80, 42 + GROUPBOX "Edition", -1, 115, 55, 80, 42 /* 待求证 */ COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP } IDD_SAVE_SETTINGS DIALOG 20, 20, 140, 60 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "虚拟终端运行参数" +CAPTION "控制台参数" FONT 9, "MS Shell Dlg" { GROUPBOX "", -1, 10, 10, 120, 31, BS_GROUPBOX - AUTORADIOBUTTON "保留当前配置以便下次使用", IDC_SAV_SAVE, 14, 15, 110, 10, WS_TABSTOP + AUTORADIOBUTTON "保留当前配置以便以后使用", IDC_SAV_SAVE, 14, 15, 110, 10, WS_TABSTOP AUTORADIOBUTTON "仅修改当前会话", IDC_SAV_SESSION, 14, 27, 110, 10, WS_TABSTOP PUSHBUTTON "确定", IDOK, 20, 45, 35, 12

1 0

Cheer Xiao : winebot: Update Simplified Chinese translation.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: f1118dc5784e70693ff19a1dc84948e08d45676f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1118dc5784e70693ff19a1dc… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:20:14 2010 +0800 winebot: Update Simplified Chinese translation. --- programs/wineboot/wineboot_Zh.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot_Zh.rc b/programs/wineboot/wineboot_Zh.rc index 8bb69d1..132c0aa 100644 --- a/programs/wineboot/wineboot_Zh.rc +++ b/programs/wineboot/wineboot_Zh.rc @@ -46,7 +46,7 @@ CAPTION "Wine" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_WAITICON, 3, 3, 10, 10 - LTEXT "正在更新位于 %s 的 Wine 配置，请稍候……", + LTEXT "正在更新位于 %s 的 Wine 配置，请稍候……", /* 译文中“位于”准确性待议 */ IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX END

1 0

Cheer Xiao : taskmgr: Update Simplified Chinese translation.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 58178d4c9b5e4846a6b6b2c1a6118250b3d212e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58178d4c9b5e4846a6b6b2c1a… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:19:36 2010 +0800 taskmgr: Update Simplified Chinese translation. --- programs/taskmgr/Zh.rc | 108 ++++++++++++++++++++++++------------------------ 1 files changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58178d4c9b5e4846a6b6b…

1 0

Cheer Xiao : winecfg: Update Simplified Chinese translation.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 6a8c51ed1d1285553de9f1bfe58f2b23ebeac051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8c51ed1d1285553de9f1bfe… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:20:30 2010 +0800 winecfg: Update Simplified Chinese translation. --- programs/winecfg/Zh.rc | 140 ++++++++++++++++++++++++++---------------------- 1 files changed, 75 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a8c51ed1d1285553de9f…

1 0

Cheer Xiao : oleview: Update Simplified Chinese translation.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: c0aecb8062b629f8286bbc1964acca377d813cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0aecb8062b629f8286bbc196… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:18:53 2010 +0800 oleview: Update Simplified Chinese translation. --- programs/oleview/Zh.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/Zh.rc b/programs/oleview/Zh.rc index 5b6e108..aef68c3 100644 --- a/programs/oleview/Zh.rc +++ b/programs/oleview/Zh.rc @@ -171,7 +171,7 @@ FONT 9, "MS Shell Dlg" LTEXT "系统设置", -1, 5, 6, 160, 8 CHECKBOX "启用分布式CO&M", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX CHECKBOX "启用远程连接(限&Win95)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX - LTEXT "这些设置只改变寄存器值(register values)。\n它对Wine的性能没有影响。", -1, 5, 50, 160, 40 + LTEXT "这些设置只改变寄存器值(register values)。\n它对Wine的性能没有影响。", -1, 5, 50, 160, 40 /* 译文待议 */ DEFPUSHBUTTON "确定(&O)", IDOK, 70, 80, 45, 14 PUSHBUTTON "取消(&C)", IDCANCEL, 120, 80, 45, 14 }

1 0

Amine Khaldi : activeds: Properly stub some exports.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 79231148fc65db835be9c3f0d231fa56deaed517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79231148fc65db835be9c3f0d… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Fri Nov 12 19:21:23 2010 +0100 activeds: Properly stub some exports. --- dlls/activeds/activeds.spec | 20 +++++----- dlls/activeds/activeds_main.c | 89 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 10 deletions(-) diff --git a/dlls/activeds/activeds.spec b/dlls/activeds/activeds.spec index 2b45834..58bd479 100644 --- a/dlls/activeds/activeds.spec +++ b/dlls/activeds/activeds.spec @@ -1,19 +1,19 @@ 3 stdcall ADsGetObject(wstr ptr ptr) 4 stdcall ADsBuildEnumerator(ptr ptr) -5 stub ADsFreeEnumerator +5 stdcall ADsFreeEnumerator(ptr) 6 stdcall ADsEnumerateNext(ptr long ptr ptr) -7 stub ADsBuildVarArrayStr -8 stub ADsBuildVarArrayInt +7 stdcall ADsBuildVarArrayStr(ptr long ptr) +8 stdcall ADsBuildVarArrayInt(ptr long ptr) 9 stdcall ADsOpenObject(wstr wstr wstr long ptr ptr) -12 stub ADsSetLastError +12 stdcall ADsSetLastError(long ptr ptr) 13 stdcall ADsGetLastError(ptr ptr long ptr long) -14 stub AllocADsMem +14 stdcall AllocADsMem(long) 15 stdcall FreeADsMem(ptr) -16 stub ReallocADsMem -17 stub AllocADsStr -18 stub FreeADsStr -19 stub ReallocADsStr -20 stub ADsEncodeBinaryData +16 stdcall ReallocADsMem(ptr long long) +17 stdcall AllocADsStr(ptr) +18 stdcall FreeADsStr(ptr) +19 stdcall ReallocADsStr(ptr ptr) +20 stdcall ADsEncodeBinaryData(ptr long ptr) 21 stub PropVariantToAdsType 22 stub AdsTypeToPropVariant 23 stub AdsFreeAdsValues diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 2fa4ec7..67066f0 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -76,6 +76,15 @@ HRESULT WINAPI ADsBuildEnumerator(IADsContainer * pADsContainer, IEnumVARIANT** } /***************************************************** + * ADsFreeEnumerator [ACTIVEDS.5] + */ +HRESULT WINAPI ADsFreeEnumerator(IEnumVARIANT* pEnumVariant) +{ + FIXME("(%p)!stub\n",pEnumVariant); + return E_NOTIMPL; +} + +/***************************************************** * ADsEnumerateNext [ACTIVEDS.6] */ HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VARIANT* pvar, ULONG * pcElementsFetched) @@ -85,6 +94,24 @@ HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VAR } /***************************************************** + * ADsBuildVarArrayStr [ACTIVEDS.7] + */ +HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *lppPathNames, DWORD dwPathNames, VARIANT* pvar) +{ + FIXME("(%p, %d, %p)!stub\n",*lppPathNames, dwPathNames, pvar); + return E_NOTIMPL; +} + +/***************************************************** + * ADsBuildVarArrayInt [ACTIVEDS.8] + */ +HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes, VARIANT* pvar) +{ + FIXME("(%p, %d, %p)!stub\n",lpdwObjectTypes, dwObjectTypes, pvar); + return E_NOTIMPL; +} + +/***************************************************** * ADsOpenObject [ACTIVEDS.9] */ HRESULT WINAPI ADsOpenObject(LPCWSTR lpszPathName, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwReserved, REFIID riid, VOID** ppObject) @@ -95,6 +122,14 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR lpszPathName, LPCWSTR lpszUserName, LPCWSTR } /***************************************************** + * ADsSetLastError [ACTIVEDS.12] + */ +VOID WINAPI ADsSetLastError(DWORD dwErr, LPWSTR pszError, LPWSTR pszProvider) +{ + FIXME("(%d,%p,%p)!stub\n", dwErr, pszError, pszProvider); +} + +/***************************************************** * ADsGetLastError [ACTIVEDS.13] */ HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD errorbuflen, LPWSTR namebuf, DWORD namebuflen) @@ -104,6 +139,15 @@ HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD errorbufle } /***************************************************** + * AllocADsMem [ACTIVEDS.14] + */ +LPVOID WINAPI AllocADsMem(DWORD cb) +{ + FIXME("(%d)!stub\n",cb); + return NULL; +} + +/***************************************************** * FreeADsMem [ACTIVEDS.15] */ BOOL WINAPI FreeADsMem(LPVOID pMem) @@ -111,3 +155,48 @@ BOOL WINAPI FreeADsMem(LPVOID pMem) FIXME("(%p)!stub\n",pMem); return FALSE; } + +/***************************************************** + * ReallocADsMem [ACTIVEDS.16] + */ +LPVOID WINAPI ReallocADsMem(LPVOID pOldMem, DWORD cbOld, DWORD cbNew) +{ + FIXME("(%p,%d,%d)!stub\n", pOldMem, cbOld, cbNew); + return NULL; +} + +/***************************************************** + * AllocADsStr [ACTIVEDS.17] + */ +LPWSTR WINAPI AllocADsStr(LPWSTR pStr) +{ + FIXME("(%p)!stub\n",pStr); + return NULL; +} + +/***************************************************** + * FreeADsStr [ACTIVEDS.18] + */ +BOOL WINAPI FreeADsStr(LPWSTR pStr) +{ + FIXME("(%p)!stub\n",pStr); + return FALSE; +} + +/***************************************************** + * ReallocADsStr [ACTIVEDS.19] + */ +BOOL WINAPI ReallocADsStr(LPWSTR *ppStr, LPWSTR pStr) +{ + FIXME("(%p,%p)!stub\n",*ppStr, pStr); + return FALSE; +} + +/***************************************************** + * ADsEncodeBinaryData [ACTIVEDS.20] + */ +HRESULT WINAPI ADsEncodeBinaryData(PBYTE pbSrcData, DWORD dwSrcLen, LPWSTR *ppszDestData) +{ + FIXME("(%p,%d,%p)!stub\n", pbSrcData, dwSrcLen, *ppszDestData); + return E_NOTIMPL; +}

1 0

Detlef Riekenberg : msvcr90: Forward getenv_s to msvcrt.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 776c53d9e4b8fb84fbe2d3ed2308e0c85f1f6d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=776c53d9e4b8fb84fbe2d3ed2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Nov 13 00:03:30 2010 +0100 msvcr90: Forward getenv_s to msvcrt. --- dlls/msvcr90/msvcr90.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 99e81fd..2799f45 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1323,7 +1323,7 @@ @ cdecl getc(ptr) msvcrt.getc @ cdecl getchar() msvcrt.getchar @ cdecl getenv(str) msvcrt.getenv -@ stub getenv_s +@ cdecl getenv_s(ptr ptr long str) msvcrt.getenv_s @ cdecl gets(str) msvcrt.gets @ stub gets_s @ cdecl getwc(ptr) msvcrt.getwc

1 0

Cheer Xiao : comdlg32: Update Simplified Chinese translation.
by Alexandre Julliard Nov. 15, 2010

Nov. 15, 2010

Module: wine Branch: master Commit: 9b177967722552f002839a180674ccb66776b16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b177967722552f002839a180… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Sat Nov 13 16:18:15 2010 +0800 comdlg32: Update Simplified Chinese translation. --- dlls/comdlg32/cdlg_Zh.rc | 183 +++++++++++++++++++++++----------------------- 1 files changed, 91 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b177967722552f002839…

1 0