July 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : mpr: Use neutral language for the version resource.
by Alexandre Julliard July 9, 2013

July 9, 2013

Module: wine Branch: master Commit: 14aa4303143866dd6e9bfc35369c95b387b717f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14aa4303143866dd6e9bfc353… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 15:47:34 2013 +0200 mpr: Use neutral language for the version resource. --- dlls/mpr/mpr.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc index 1e5a6aa..73b00c4 100644 --- a/dlls/mpr/mpr.rc +++ b/dlls/mpr/mpr.rc @@ -47,6 +47,8 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancel", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Multiprotocol Router Library" #define WINE_FILENAME_STR "mpr.dll" #define WINE_FILEVERSION 5,0,2195,6611

1 0

Alexandre Julliard : taskmgr: Convert version resource to the standard format.
by Alexandre Julliard July 9, 2013

July 9, 2013

Module: wine Branch: master Commit: f241725bd8495fcaa902b8006be6eef6aac1ee1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f241725bd8495fcaa902b8006… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 14:33:05 2013 +0200 taskmgr: Convert version resource to the standard format. --- programs/taskmgr/taskmgr.rc | 41 +++++++++-------------------------------- 1 files changed, 9 insertions(+), 32 deletions(-) diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc index 741c61f..c8b5999 100644 --- a/programs/taskmgr/taskmgr.rc +++ b/programs/taskmgr/taskmgr.rc @@ -590,38 +590,15 @@ IDI_WINDOWSM ICON windowsm.ico Version */ -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "Brian Palmer\0" - VALUE "FileDescription", "Task Manager by Brian Palmer\0" - VALUE "FileVersion", "1.0.0.1\0" - VALUE "InternalName", "taskmgr\0" - VALUE "LegalCopyright", "Copyright © Brian Palmer 2000\0" - VALUE "OriginalFilename", "taskmgr.exe\0" - VALUE "ProductName", "Task Manager by Brian Palmer\0" - VALUE "ProductVersion", "1.0.0.1\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +#define WINE_FILEVERSION 1,0,0,1 +#define WINE_FILEVERSION_STR "1.0.0.1" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEDESCRIPTION_STR "Wine Task Manager" +#define WINE_FILENAME "taskmgr" +#define WINE_FILENAME_STR "taskmgr.exe" +#define WINE_PRODUCTNAME_STR "Task Manager by Brian Palmer" + +#include "wine/wine_common_ver.rc" /* Bitmap

1 0

Ken Thomases : winemac: Add registry setting to control setting display gamma ramp.
by Alexandre Julliard July 9, 2013

July 9, 2013

Module: wine Branch: master Commit: 4f23821f080ead6232377141fb10338d4f2a04cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f23821f080ead6232377141f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 8 17:36:49 2013 -0500 winemac: Add registry setting to control setting display gamma ramp. --- dlls/winemac.drv/display.c | 6 ++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 9ed02f8..e44415d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -797,6 +797,12 @@ BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) TRACE("dev %p ramp %p\n", dev, ramp); + if (!allow_set_gamma) + { + TRACE("disallowed by registry setting\n"); + return FALSE; + } + if (macdrv_get_displays(&displays, &num_displays)) { WARN("failed to get Mac displays\n"); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 3c7bea5..4c74ddc 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -37,6 +37,7 @@ extern BOOL skip_single_buffer_flushes DECLSPEC_HIDDEN; extern BOOL allow_vsync DECLSPEC_HIDDEN; +extern BOOL allow_set_gamma DECLSPEC_HIDDEN; extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 6bae707..dd032f3 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -49,6 +49,7 @@ int topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN; int capture_displays_for_fullscreen = 0; BOOL skip_single_buffer_flushes = FALSE; BOOL allow_vsync = TRUE; +BOOL allow_set_gamma = TRUE; /************************************************************************** @@ -164,6 +165,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "AllowVerticalSync", buffer, sizeof(buffer))) allow_vsync = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "AllowSetGamma", buffer, sizeof(buffer))) + allow_set_gamma = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); }

1 0

Alexandre Julliard : browseui: Use neutral language for the version resource.
by Alexandre Julliard July 9, 2013

July 9, 2013

Module: wine Branch: master Commit: 71e765aab5035c1d1f4e24e844e8e91ae3b4f5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e765aab5035c1d1f4e24e84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 15:47:00 2013 +0200 browseui: Use neutral language for the version resource. --- dlls/browseui/browseui.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 3257466..10f3db2 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -38,6 +38,8 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "browseui.dll" #define WINE_FILEVERSION 6,0,2900,2180

1 0

Alexandre Julliard : oleacc: Use neutral language for the version resource.
by Alexandre Julliard July 9, 2013

July 9, 2013

Module: wine Branch: master Commit: b842a0c0684c60264e9b6297c5e144020febef40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b842a0c0684c60264e9b6297c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 15:47:40 2013 +0200 oleacc: Use neutral language for the version resource. --- dlls/oleacc/oleacc.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/oleacc.rc b/dlls/oleacc/oleacc.rc index bc705e0..16e3a57 100644 --- a/dlls/oleacc/oleacc.rc +++ b/dlls/oleacc/oleacc.rc @@ -91,6 +91,8 @@ STRINGTABLE ROLE_SYSTEM_OUTLINEBUTTON "outline button" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine OLE Accessibility" #define WINE_FILENAME_STR "oleacc.dll" #define WINE_FILEVERSION 7,0,0,0

1 0

Dmitry Timoshkov : gdiplus: Add more clipping region tests.
by Alexandre Julliard July 9, 2013

July 9, 2013

Module: wine Branch: master Commit: ccdc41d8c4865362173977cce8cda79312c5638e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdc41d8c4865362173977cce… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 9 18:11:31 2013 +0900 gdiplus: Add more clipping region tests. --- dlls/gdiplus/tests/graphics.c | 135 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e12cac0..6c050fb 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4529,6 +4529,9 @@ static void test_clipping(void) GpRegion *region; GpMatrix *matrix; GpRectF rect; + HRGN hrgn; + int ret; + RECT rc; hdc = CreateCompatibleDC(0); status = GdipCreateFromHDC(hdc, &graphics); @@ -4553,6 +4556,17 @@ static void test_clipping(void) expectf(100.0, rect.Width); expectf(100.0, rect.Height); + status = GdipSetEmpty(region); + expect(Ok, status); + status = GdipGetClip(graphics, region); + expect(Ok, status); + status = GdipGetRegionBounds(region, graphics, &rect); + expect(Ok, status); + expectf(100.0, rect.X); + expectf(100.0, rect.Y); + expectf(100.0, rect.Width); + expectf(100.0, rect.Height); + status = GdipCreateMatrix(&matrix); expect(Ok, status); status = GdipScaleMatrix(matrix, 2.0, 4.0, MatrixOrderAppend); @@ -4573,6 +4587,127 @@ todo_wine todo_wine expectf(25.0, rect.Height); + status = GdipSetEmpty(region); + expect(Ok, status); + status = GdipGetClip(graphics, region); + expect(Ok, status); + status = GdipGetRegionBounds(region, graphics, &rect); + expect(Ok, status); +todo_wine + expectf(45.0, rect.X); +todo_wine + expectf(20.0, rect.Y); +todo_wine + expectf(50.0, rect.Width); +todo_wine + expectf(25.0, rect.Height); + + status = GdipGetRegionHRgn(region, NULL, &hrgn); + expect(Ok, status); + ret = GetRgnBox(hrgn, &rc); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); +todo_wine + ok(rc.left == 45 && rc.top == 20 && rc.right == 95 && rc.bottom == 45, + "expected 45,20-95,45, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + DeleteObject(hrgn); + + status = GdipGetRegionHRgn(region, graphics, &hrgn); + expect(Ok, status); + ret = GetRgnBox(hrgn, &rc); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); +todo_wine + ok(rc.left == 100 && rc.top == 100 && rc.right == 200 && rc.bottom == 200, + "expected 100,100-200,200, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + DeleteObject(hrgn); + + status = GdipSetPageScale(graphics, 2.0); + expect(Ok, status); + + status = GdipGetClipBounds(graphics, &rect); + expect(Ok, status); +todo_wine + expectf(45.0, rect.X); +todo_wine + expectf(20.0, rect.Y); +todo_wine + expectf(50.0, rect.Width); +todo_wine + expectf(25.0, rect.Height); + + status = GdipSetEmpty(region); + expect(Ok, status); + status = GdipGetClip(graphics, region); + expect(Ok, status); + status = GdipGetRegionBounds(region, graphics, &rect); + expect(Ok, status); +todo_wine + expectf(45.0, rect.X); +todo_wine + expectf(20.0, rect.Y); +todo_wine + expectf(50.0, rect.Width); +todo_wine + expectf(25.0, rect.Height); + + status = GdipGetRegionHRgn(region, NULL, &hrgn); + expect(Ok, status); + ret = GetRgnBox(hrgn, &rc); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); +todo_wine + ok(rc.left == 45 && rc.top == 20 && rc.right == 95 && rc.bottom == 45, + "expected 45,20-95,45, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + DeleteObject(hrgn); + + status = GdipGetRegionHRgn(region, graphics, &hrgn); + expect(Ok, status); + ret = GetRgnBox(hrgn, &rc); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); +todo_wine + ok(rc.left == 100 && rc.top == 100 && rc.right == 200 && rc.bottom == 200, + "expected 100,100-200,200, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + DeleteObject(hrgn); + + GdipSetPageUnit(graphics, UnitPoint); + expect(Ok, status); + + status = GdipGetClipBounds(graphics, &rect); + expect(Ok, status); +todo_wine + ok((rect.X == 13.75 && rect.Y == 4.375 && rect.Width == 18.75 && rect.Height == 9.375) || + broken(rect.X == 45.0 && rect.Y == 20.0 && rect.Width == 50.0 && rect.Height == 25.0) /* before Win7 */, + "expected 13.75,4.375-18.75,9.375, got %.2f,%.2f-%.2f,%.2f\n", rect.X, rect.Y, rect.Width, rect.Height); + + status = GdipSetEmpty(region); + expect(Ok, status); + status = GdipGetClip(graphics, region); + expect(Ok, status); + status = GdipGetRegionBounds(region, graphics, &rect); + expect(Ok, status); +todo_wine + ok((rect.X == 13.75 && rect.Y == 4.375 && rect.Width == 18.75 && rect.Height == 9.375) || + broken(rect.X == 45.0 && rect.Y == 20.0 && rect.Width == 50.0 && rect.Height == 25.0) /* before Win7 */, + "expected 13.75,4.375-18.75,9.375, got %.2f,%.2f-%.2f,%.2f\n", rect.X, rect.Y, rect.Width, rect.Height); + + status = GdipGetRegionHRgn(region, NULL, &hrgn); + expect(Ok, status); + ret = GetRgnBox(hrgn, &rc); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); +todo_wine + ok((rc.left == 14 && rc.top == 5 && rc.right == 33 && rc.bottom == 14) || + broken(rc.left == 45 && rc.top == 20 && rc.right == 95 && rc.bottom == 45) /* before Win7 */, + "expected 14,5-33,14, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + DeleteObject(hrgn); + + status = GdipGetRegionHRgn(region, graphics, &hrgn); + expect(Ok, status); + ret = GetRgnBox(hrgn, &rc); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); +todo_wine + ok((rc.left == 100 && rc.top == 100 && rc.right == 200 && rc.bottom == 200) || + broken(rc.left == 267 && rc.top == 267 && rc.right == 534 && rc.bottom == 534) /* before Win7 */, + "expected 100,100-200,200, got %d,%d-%d,%d\n", rc.left, rc.top, rc.right, rc.bottom); + DeleteObject(hrgn); + GdipDeleteMatrix(matrix); GdipDeleteRegion(region); GdipDeleteGraphics(graphics);

1 0

Francois Gouget : po: Update the Hebrew 'translations' for the netstat command line tool.
by Alexandre Julliard July 9, 2013

July 9, 2013

Module: wine Branch: master Commit: 2cf7c3f4345f09547ec5a7e050dfd710b88bbc71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf7c3f4345f09547ec5a7e05… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 9 17:07:42 2013 +0200 po: Update the Hebrew 'translations' for the netstat command line tool. Due to lack of proper RTL support in console applications, command line messages must remain in English. --- po/he.po | 83 +++++++++++++++++++++----------------------------------------- 1 files changed, 28 insertions(+), 55 deletions(-) diff --git a/po/he.po b/po/he.po index b542d95..48415a2 100644 --- a/po/he.po +++ b/po/he.po @@ -10455,143 +10455,116 @@ msgid "The following services are running:\n" msgstr "The following services are running:\n" #: netstat.rc:27 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "חיבור רשת מקומית" +msgstr "Active Connections" #: netstat.rc:28 msgid "Proto" -msgstr "" +msgstr "Proto" #: netstat.rc:29 -#, fuzzy -#| msgid "Email Address=" msgid "Local Address" -msgstr "כתובת דוא״ל=" +msgstr "Local Address" #: netstat.rc:30 -#, fuzzy -#| msgid "Address" msgid "Foreign Address" -msgstr "כתובת" +msgstr "Foreign Address" #: netstat.rc:31 -#, fuzzy -#| msgid "Status" msgid "State" -msgstr "מצב" +msgstr "State" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "מנשקים" +msgstr "Interface Statistics" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Sent" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Received" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "בתים" +msgstr "Bytes" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "Unicast packets" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Non-unicast packets" #: netstat.rc:38 msgid "Discards" -msgstr "" +msgstr "Discards" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" -msgstr "שגיאה" +msgstr "Errors" #: netstat.rc:40 -#, fuzzy msgid "Unknown protocols" -msgstr "שגיאה בלתי ידוע.\n" +msgstr "Unknown protocols" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "TCP Statistics for IPv4" #: netstat.rc:42 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Opens" -msgstr "חיבור רשת מקומית" +msgstr "Active Opens" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Passive Opens" #: netstat.rc:44 -#, fuzzy -#| msgid "LAN Connection" msgid "Failed Connection Attempts" -msgstr "חיבור רשת מקומית" +msgstr "Failed Connection Attempts" #: netstat.rc:45 -#, fuzzy -#| msgid "LAN Connection" msgid "Reset Connections" -msgstr "חיבור רשת מקומית" +msgstr "Reset Connections" #: netstat.rc:46 -#, fuzzy -#| msgid "LAN Connection" msgid "Current Connections" -msgstr "חיבור רשת מקומית" +msgstr "Current Connections" #: netstat.rc:47 msgid "Segments Received" -msgstr "" +msgstr "Segments Received" #: netstat.rc:48 msgid "Segments Sent" -msgstr "" +msgstr "Segments Sent" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Segments Retransmitted" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "UDP Statistics for IPv4" #: netstat.rc:51 msgid "Datagrams Received" -msgstr "" +msgstr "Datagrams Received" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "פתחה מקומית" +msgstr "No Ports" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "שגיאת פענוח" +msgstr "Receive Errors" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Datagrams Sent" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Alexandre Julliard : mapi32: Use neutral language for the version resource.
by Alexandre Julliard July 9, 2013

July 9, 2013

Module: wine Branch: master Commit: 8e9d6203f0038dafba3f9eb7003074ec7b072ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9d6203f0038dafba3f9eb70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 15:47:30 2013 +0200 mapi32: Use neutral language for the version resource. --- dlls/mapi32/mapi32.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/mapi32.rc b/dlls/mapi32/mapi32.rc index b51f464..f2c232a 100644 --- a/dlls/mapi32/mapi32.rc +++ b/dlls/mapi32/mapi32.rc @@ -29,6 +29,8 @@ STRINGTABLE IDS_SEND_MAIL, "Send Mail" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Messaging API" #define WINE_FILENAME_STR "mapi32.dll" #define WINE_FILEVERSION 1,0,0,0

1 0

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard July 9, 2013

July 9, 2013

Module: wine Branch: master Commit: b40479d9b8cc3ffa652e56383442dcdc0fb808b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b40479d9b8cc3ffa652e56383… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Tue Jul 9 21:39:09 2013 +0800 po: Update Simplified Chinese translation. --- po/zh_CN.po | 70 +++++++++++++++------------------------------------------- 1 files changed, 18 insertions(+), 52 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e1a5b39..ac1564e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -28,16 +28,11 @@ msgid "&Install..." msgstr "安装(&I)..." #: appwiz.rc:62 -#, fuzzy -#| msgid "" -#| "The following software can be automatically removed. To remove a program " -#| "or to modify its installed components, select it from the list and click " -#| "Change/Remove." msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" "Remove." -msgstr "下列软件可以自动卸载。按'添加/删除'可卸载选定程序或者调整已安装部件。" +msgstr "下列软件可以自动卸载。按'修改/删除'可卸载选定程序或者调整已安装部件。" #: appwiz.rc:64 msgid "&Support Information" @@ -154,21 +149,10 @@ msgid "Cancel" msgstr "取消" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko 安装" +msgstr "Wine Mono 安装" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -177,10 +161,10 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine 未找到到用于支持嵌入 HTML 的 Gecko 引擎。Wine 可以自动并下载安装它。\n" +"Wine 未找到到用于支持 .NET 应用的 Mono 组件。Wine 可以自动并下载安装它。\n" "\n" "注意: 推荐您安装为发行版定制的软件包。具体请参看 <a href=\"http://wiki." -"winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a>。" +"winehq.org/Mono\">http://wiki.winehq.org/Mono</a>。" #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -3366,10 +3350,8 @@ msgid "Connected" msgstr "连接断开" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "停用(&D)" +msgstr "停用" #: joy.rc:42 msgid "" @@ -3456,10 +3438,8 @@ msgid "Expected ')'" msgstr "" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "无效参数。\n" +msgstr "无效字符" #: jscript.rc:38 msgid "Unterminated string constant" @@ -8168,10 +8148,8 @@ msgid "Security Warning" msgstr "安全警告" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "还是要继续吗？" +msgstr "是否安装该软件？" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" @@ -8190,22 +8168,16 @@ msgid "" msgstr "" #: urlmon.rc:48 -#, fuzzy -#| msgid "Installation failure.\n" msgid "Installation of component failed: %08x" -msgstr "安装失败。\n" +msgstr "安装组件失败：%08x" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "安装(&I)" +msgstr "安装 (%d)" #: urlmon.rc:50 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "安装(&I)" +msgstr "安装" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window" @@ -9671,11 +9643,11 @@ msgstr "" #: cmd.rc:354 msgid " (Yes|No)" -msgstr "" +msgstr " (是(Y)|否(N))" #: cmd.rc:355 msgid " (Yes|No|All)" -msgstr "" +msgstr " (是(Y)|否(N)|全部(A))" #: cmd.rc:356 msgid "" @@ -13377,22 +13349,16 @@ msgid "Help topics: " msgstr "帮助主题： " #: wmic.rc:25 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Error: Command line not supported\n" -msgstr "不支持此操作。\n" +msgstr "错误：不支持此命令行\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "找不到属性集。\n" +msgstr "错误：找不到该别名\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Error: Invalid query\n" -msgstr "请求语法无效。\n" +msgstr "错误：无效查询\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N" @@ -13782,15 +13748,15 @@ msgid "" msgstr "" "%1 是一个在目标路径上的\n" "文件名还是目录？\n" -"（F - 文件，D - 目录）\n" +"(F - 文件，D - 目录)\n" #: xcopy.rc:35 msgid "%1? (Yes|No)\n" -msgstr "%1？（Yes|No）\n" +msgstr "%1？(是(Y)|否(N))\n" #: xcopy.rc:36 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "是否覆盖 %1？（Yes|No|All）\n" +msgstr "是否覆盖 %1？(是(Y)|否(N)|全部(A))\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n"

1 0

Alexandre Julliard : winspool: Use neutral language for the version resource.
by Alexandre Julliard July 9, 2013

July 9, 2013

Module: wine Branch: master Commit: ae6aef547b825d124ecedc032b73f5e6d22986dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6aef547b825d124ecedc032… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 9 15:48:06 2013 +0200 winspool: Use neutral language for the version resource. --- dlls/winspool.drv/winspool.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/winspool.rc b/dlls/winspool.drv/winspool.rc index 3072ff1..9b88b8d 100644 --- a/dlls/winspool.drv/winspool.rc +++ b/dlls/winspool.drv/winspool.rc @@ -40,6 +40,8 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE END +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILENAME_STR "winspool.drv" #define WINE_FILEDESCRIPTION_STR "Wine core printer driver"

1 0