- wine-devel - winehq.org

[PATCH 1/4] dinput8/tests: Test simple joystick with older dinput versions.
by Rémi Bernon 03 Jan '22

03 Jan '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This will overflow the test output limit on Wine, and I'm not sure what to do about it. I don't think there's an unusually large number of todos but the number of tests in this file simply has grow very large. I can split the tests into individual files, if that's better, but I believe it will make some of the tests run less often if they aren't touched, which may not be desirable. dlls/dinput8/tests/hid.c | 464 ++++++++++++++++++++++++++++----------- 1 file changed, 335 insertions(+), 129 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 82657c2e235..17559c61a39 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3350,8 +3350,11 @@ static BOOL CALLBACK find_test_device( const DIDEVICEINSTANCEW *devinst, void *c struct check_objects_todos { BOOL type; + BOOL ofs; BOOL guid; + BOOL flags; BOOL usage; + BOOL usage_page; BOOL name; }; @@ -3388,16 +3391,18 @@ static BOOL CALLBACK check_objects( const DIDEVICEOBJECTINSTANCEW *obj, void *ar check_member( *obj, *exp, "%u", dwSize ); todo_wine_if( todo->guid ) check_member_guid( *obj, *exp, guidType ); - todo_wine_if( params->version < 0x700 && (obj->dwType & DIDFT_BUTTON) ) + todo_wine_if( todo->ofs ) check_member( *obj, *exp, "%#x", dwOfs ); todo_wine_if( todo->type ) check_member( *obj, *exp, "%#x", dwType ); + todo_wine_if( todo->flags ) check_member( *obj, *exp, "%#x", dwFlags ); if (!localized) todo_wine_if( todo->name )check_member_wstr( *obj, *exp, tszName ); check_member( *obj, *exp, "%u", dwFFMaxForce ); check_member( *obj, *exp, "%u", dwFFForceResolution ); check_member( *obj, *exp, "%u", wCollectionNumber ); check_member( *obj, *exp, "%u", wDesignatorIndex ); + todo_wine_if( todo->usage_page ) check_member( *obj, *exp, "%#04x", wUsagePage ); todo_wine_if( todo->usage ) check_member( *obj, *exp, "%#04x", wUsage ); @@ -3681,7 +3686,7 @@ static HRESULT create_dinput_device( DWORD version, DIDEVICEINSTANCEW *devinst, return DI_OK; } -static void test_simple_joystick(void) +static void test_simple_joystick( DWORD version ) { #include "psh_hid_macros.h" static const unsigned char report_desc[] = @@ -3737,11 +3742,12 @@ static void test_simple_joystick(void) { .InputReportByteLength = 9, }; - static const DIDEVCAPS expect_caps = + const DIDEVCAPS expect_caps = { .dwSize = sizeof(DIDEVCAPS), .dwFlags = DIDC_ATTACHED | DIDC_EMULATED, - .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK + : DIDEVTYPE_HID | (DIDEVTYPEJOYSTICK_RUDDER << 8) | DIDEVTYPE_JOYSTICK, .dwAxes = 6, .dwPOVs = 1, .dwButtons = 2, @@ -3826,7 +3832,8 @@ static void test_simple_joystick(void) .dwSize = sizeof(DIDEVICEINSTANCEW), .guidInstance = expect_guid_product, .guidProduct = expect_guid_product, - .dwDevType = DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID | (DI8DEVTYPEJOYSTICK_LIMITED << 8) | DI8DEVTYPE_JOYSTICK + : DIDEVTYPE_HID | (DIDEVTYPEJOYSTICK_RUDDER << 8) | DIDEVTYPE_JOYSTICK, .tszInstanceName = L"Wine test root driver", .tszProductName = L"Wine test root driver", .guidFFDriver = GUID_NULL, @@ -3954,14 +3961,110 @@ static void test_simple_joystick(void) .wUsage = HID_USAGE_GENERIC_JOYSTICK, }, }; - const DIEFFECTINFOW expect_effects[] = {}; - + const DIDEVICEOBJECTINSTANCEW expect_objects_5[] = + { + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_XAxis, + .dwOfs = DIJOFS_X, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(0), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"X Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_X, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_YAxis, + .dwOfs = DIJOFS_Y, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(1), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Y Axis", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_Y, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_ZAxis, + .dwOfs = DIJOFS_Z, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(2), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Wheel", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_WHEEL, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_RzAxis, + .dwOfs = DIJOFS_RZ, + .dwType = DIDFT_ABSAXIS|DIDFT_MAKEINSTANCE(5), + .dwFlags = DIDOI_ASPECTPOSITION, + .tszName = L"Rudder", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_SIMULATION, + .wUsage = HID_USAGE_SIMULATION_RUDDER, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_POV, + .dwOfs = DIJOFS_POV(0), + .dwType = DIDFT_POV|DIDFT_MAKEINSTANCE(0), + .tszName = L"Hat Switch", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_HATSWITCH, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = DIJOFS_BUTTON(0), + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(0), + .tszName = L"Button 0", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_BUTTON, + .wUsage = 0x1, + .wReportId = 1, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Button, + .dwOfs = DIJOFS_BUTTON(1), + .dwType = DIDFT_PSHBUTTON|DIDFT_MAKEINSTANCE(1), + .tszName = L"Button 1", + .wCollectionNumber = 1, + .wUsagePage = HID_USAGE_PAGE_BUTTON, + .wUsage = 0x2, + .wReportId = 1, + }, + }; + struct check_objects_todos todo_objects_5[ARRAY_SIZE(expect_objects_5)] = + { + {.guid = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .type = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .flags = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + {.guid = TRUE, .ofs = TRUE, .type = TRUE, .usage = TRUE, .usage_page = TRUE, .name = TRUE}, + }; struct check_objects_params check_objects_params = { - .version = DIRECTINPUT_VERSION, - .expect_count = ARRAY_SIZE(expect_objects), - .expect_objs = expect_objects, + .version = version, + .expect_count = version < 0x700 ? ARRAY_SIZE(expect_objects_5) : ARRAY_SIZE(expect_objects), + .expect_objs = version < 0x700 ? expect_objects_5 : expect_objects, + .todo_objs = version < 0x700 ? todo_objects_5 : NULL, + .todo_extra = version < 0x700 ? TRUE : FALSE, }; + + const DIEFFECTINFOW expect_effects[] = {}; struct check_effects_params check_effects_params = { .expect_count = ARRAY_SIZE(expect_effects), @@ -4015,44 +4118,55 @@ static void test_simple_joystick(void) WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; DIDEVICEOBJECTDATA objdata[32] = {{0}}; DIDEVICEOBJECTINSTANCEW objinst = {0}; + DIDEVICEOBJECTINSTANCEW expect_obj; DIDEVICEINSTANCEW devinst = {0}; DIEFFECTINFOW effectinfo = {0}; DIDATAFORMAT dataformat = {0}; IDirectInputDevice8W *device; IDirectInputEffect *effect; DIEFFESCAPE escape = {0}; + ULONG i, size, res, ref; DIDEVCAPS caps = {0}; HANDLE event, file; char buffer[1024]; DIJOYSTATE2 state; - ULONG i, res, ref; HRESULT hr; WCHAR *tmp; GUID guid; HWND hwnd; + winetest_push_context( "version %#x", version ); + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); SetCurrentDirectoryW( tempdir ); cleanup_registry_keys(); if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; - if (FAILED(hr = create_dinput_device( DIRECTINPUT_VERSION, &devinst, &device ))) goto done; + if (FAILED(hr = create_dinput_device( version, &devinst, &device ))) goto done; - hr = IDirectInputDevice8_Initialize( device, instance, 0x0700, &GUID_NULL ); - todo_wine - ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, NULL ); + hr = IDirectInputDevice8_Initialize( device, instance, 0x800 - (version - 0x700), &GUID_NULL ); + if (version == 0x800) + { + todo_wine + ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); + } + else + { + todo_wine + ok( hr == DIERR_OLDDIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); + } + hr = IDirectInputDevice8_Initialize( device, instance, version, NULL ); todo_wine ok( hr == E_POINTER, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, NULL, DIRECTINPUT_VERSION, &GUID_NULL ); + hr = IDirectInputDevice8_Initialize( device, NULL, version, &GUID_NULL ); todo_wine ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &GUID_NULL ); + hr = IDirectInputDevice8_Initialize( device, instance, version, &GUID_NULL ); todo_wine ok( hr == REGDB_E_CLASSNOTREG, "Initialize returned %#x\n", hr ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &devinst.guidInstance ); + hr = IDirectInputDevice8_Initialize( device, instance, version, &devinst.guidInstance ); ok( hr == DI_OK, "Initialize returned %#x\n", hr ); guid = devinst.guidInstance; memset( &devinst, 0, sizeof(devinst) ); @@ -4061,7 +4175,7 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); ok( IsEqualGUID( &guid, &devinst.guidInstance ), "got %s expected %s\n", debugstr_guid( &guid ), debugstr_guid( &devinst.guidInstance ) ); - hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &devinst.guidProduct ); + hr = IDirectInputDevice8_Initialize( device, instance, version, &devinst.guidProduct ); ok( hr == DI_OK, "Initialize returned %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceInfo( device, NULL ); @@ -4076,6 +4190,7 @@ static void test_simple_joystick(void) todo_wine check_member_guid( devinst, expect_devinst, guidInstance ); check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine_if( version < 0x0800 ) check_member( devinst, expect_devinst, "%#x", dwDevType ); todo_wine check_member_wstr( devinst, expect_devinst, tszInstanceName ); @@ -4090,6 +4205,7 @@ static void test_simple_joystick(void) todo_wine check_member_guid( devinst, expect_devinst, guidInstance ); check_member_guid( devinst, expect_devinst, guidProduct ); + todo_wine_if( version < 0x0800 ) check_member( devinst, expect_devinst, "%#x", dwDevType ); todo_wine check_member_wstr( devinst, expect_devinst, tszInstanceName ); @@ -4108,6 +4224,7 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps, "%d", dwSize ); check_member( caps, expect_caps, "%#x", dwFlags ); + todo_wine_if( version < 0x0800 ) check_member( caps, expect_caps, "%#x", dwDevType ); check_member( caps, expect_caps, "%d", dwAxes ); check_member( caps, expect_caps, "%d", dwButtons ); @@ -4125,7 +4242,9 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, NULL ); ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_string.diph ); - ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), + "GetProperty DIPROP_VIDPID returned %#x\n", hr ); prop_dword.diph.dwHeaderSize = sizeof(DIPROPHEADER) - 1; hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); @@ -4133,8 +4252,14 @@ static void test_simple_joystick(void) prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_VIDPID returned %#x\n", hr ); - ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", prop_dword.dwData, EXPECT_VIDPID ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_VIDPID returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", + prop_dword.dwData, EXPECT_VIDPID ); + } hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); ok( hr == DI_OK, "GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); @@ -4163,14 +4288,23 @@ static void test_simple_joystick(void) ok( !wcscmp( prop_string.wsz, expect_devinst.tszProductName ), "got product %s\n", debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_TYPENAME, &prop_string.diph ); - todo_wine - ok( hr == DI_OK, "GetProperty DIPROP_TYPENAME returned %#x\n", hr ); - todo_wine - ok( !wcscmp( prop_string.wsz, expect_vidpid_str ), "got type %s\n", debugstr_w(prop_string.wsz) ); + todo_wine_if( version >= 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_TYPENAME returned %#x\n", hr ); + if (hr == DI_OK) + { + todo_wine + ok( !wcscmp( prop_string.wsz, expect_vidpid_str ), "got type %s\n", debugstr_w(prop_string.wsz) ); + } hr = IDirectInputDevice8_GetProperty( device, DIPROP_USERNAME, &prop_string.diph ); - ok( hr == S_FALSE, "GetProperty DIPROP_USERNAME returned %#x\n", hr ); - todo_wine - ok( !wcscmp( prop_string.wsz, L"" ), "got user %s\n", debugstr_w(prop_string.wsz) ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_NOEFFECT), + "GetProperty DIPROP_USERNAME returned %#x\n", hr ); + if (hr == DI_NOEFFECT) + { + todo_wine + ok( !wcscmp( prop_string.wsz, L"" ), "got user %s\n", debugstr_w(prop_string.wsz) ); + } prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_JOYSTICKID, &prop_dword.diph ); @@ -4210,7 +4344,9 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_RANGE returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); - ok( hr == DIERR_INVALIDPARAM, "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), + "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); @@ -4238,9 +4374,14 @@ static void test_simple_joystick(void) prop_string.diph.dwHow = DIPH_BYUSAGE; prop_string.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); - ok( !wcscmp( prop_string.wsz, expect_objects[4].tszName ), "got DIPROP_KEYNAME %s\n", - debugstr_w( prop_string.wsz ) ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_KEYNAME returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( !wcscmp( prop_string.wsz, expect_objects[4].tszName ), "got DIPROP_KEYNAME %s\n", + debugstr_w( prop_string.wsz ) ); + } prop_string.diph.dwObj = MAKELONG( 0x1, HID_USAGE_PAGE_BUTTON ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_KEYNAME, &prop_string.diph ); todo_wine @@ -4255,7 +4396,9 @@ static void test_simple_joystick(void) prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DIERR_NOTFOUND, "GetProperty DIPROP_RANGE returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DI_OK : DIERR_NOTFOUND), + "GetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwObj = MAKELONG( 0, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DIERR_NOTFOUND, "GetProperty DIPROP_RANGE returned %#x\n", hr ); @@ -4270,19 +4413,33 @@ static void test_simple_joystick(void) ok( prop_range.lMin == 0, "got %d expected %d\n", prop_range.lMin, 0 ); ok( prop_range.lMax == 65535, "got %d expected %d\n", prop_range.lMax, 65535 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); - ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); - ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); + ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + } hr = IDirectInputDevice8_GetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); - ok( hr == DI_OK, "GetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); - ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); - ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "GetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); + if (hr == DI_OK) + { + ok( prop_range.lMin == -25, "got %d expected %d\n", prop_range.lMin, -25 ); + ok( prop_range.lMax == 56, "got %d expected %d\n", prop_range.lMax, 56 ); + } prop_pointer.diph.dwHow = DIPH_BYUSAGE; prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - todo_wine - ok( hr == DIERR_NOTINITIALIZED, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); + if (version < 0x0800) ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); + else + { + todo_wine + ok( hr == DIERR_NOTINITIALIZED, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); + } hr = IDirectInputDevice8_EnumObjects( device, NULL, NULL, DIDFT_ALL ); ok( hr == DIERR_INVALIDPARAM, "EnumObjects returned %#x\n", hr ); @@ -4291,7 +4448,8 @@ static void test_simple_joystick(void) res = 0; hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); - ok( res == 8, "got %u expected %u\n", res, 8 ); + todo_wine_if( version < 0x0700 ) + ok( res == (version < 0x0700 ? 6 : 8), "got %u objects\n", res ); hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", @@ -4307,26 +4465,30 @@ static void test_simple_joystick(void) res = MAKELONG( HID_USAGE_GENERIC_Z, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); - ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DI_OK : DIERR_NOTFOUND), "GetObjectInfo returned: %#x\n", hr ); res = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[4], "%u", dwSize ); - check_member_guid( objinst, expect_objects[4], guidType ); - check_member( objinst, expect_objects[4], "%#x", dwOfs ); - check_member( objinst, expect_objects[4], "%#x", dwType ); - check_member( objinst, expect_objects[4], "%#x", dwFlags ); - if (!localized) check_member_wstr( objinst, expect_objects[4], tszName ); - check_member( objinst, expect_objects[4], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[4], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[4], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[4], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[4], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[4], "%#04x", wUsage ); - check_member( objinst, expect_objects[4], "%#04x", dwDimension ); - check_member( objinst, expect_objects[4], "%#04x", wExponent ); - check_member( objinst, expect_objects[4], "%u", wReportId ); + if (version < 0x0700) expect_obj = expect_objects_5[0]; + else expect_obj = expect_objects[4]; + check_member( objinst, expect_obj, "%u", dwSize ); + check_member_guid( objinst, expect_obj, guidType ); + todo_wine_if( version < 0x0700 ) + check_member( objinst, expect_obj, "%#x", dwOfs ); + check_member( objinst, expect_obj, "%#x", dwType ); + check_member( objinst, expect_obj, "%#x", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_obj, tszName ); + check_member( objinst, expect_obj, "%u", dwFFMaxForce ); + check_member( objinst, expect_obj, "%u", dwFFForceResolution ); + check_member( objinst, expect_obj, "%u", wCollectionNumber ); + check_member( objinst, expect_obj, "%u", wDesignatorIndex ); + check_member( objinst, expect_obj, "%#04x", wUsagePage ); + check_member( objinst, expect_obj, "%#04x", wUsage ); + check_member( objinst, expect_obj, "%#04x", dwDimension ); + check_member( objinst, expect_obj, "%#04x", wExponent ); + check_member( objinst, expect_obj, "%u", wReportId ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0x14, DIPH_BYOFFSET ); ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); @@ -4339,21 +4501,24 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYID ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[8], "%u", dwSize ); - check_member_guid( objinst, expect_objects[8], guidType ); - check_member( objinst, expect_objects[8], "%#x", dwOfs ); - check_member( objinst, expect_objects[8], "%#x", dwType ); - check_member( objinst, expect_objects[8], "%#x", dwFlags ); - if (!localized) check_member_wstr( objinst, expect_objects[8], tszName ); - check_member( objinst, expect_objects[8], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[8], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[8], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[8], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[8], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[8], "%#04x", wUsage ); - check_member( objinst, expect_objects[8], "%#04x", dwDimension ); - check_member( objinst, expect_objects[8], "%#04x", wExponent ); - check_member( objinst, expect_objects[8], "%u", wReportId ); + if (version < 0x0700) expect_obj = expect_objects_5[6]; + else expect_obj = expect_objects[8]; + check_member( objinst, expect_obj, "%u", dwSize ); + check_member_guid( objinst, expect_obj, guidType ); + todo_wine_if( version < 0x0700 ) + check_member( objinst, expect_obj, "%#x", dwOfs ); + check_member( objinst, expect_obj, "%#x", dwType ); + check_member( objinst, expect_obj, "%#x", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_obj, tszName ); + check_member( objinst, expect_obj, "%u", dwFFMaxForce ); + check_member( objinst, expect_obj, "%u", dwFFForceResolution ); + check_member( objinst, expect_obj, "%u", wCollectionNumber ); + check_member( objinst, expect_obj, "%u", wDesignatorIndex ); + check_member( objinst, expect_obj, "%#04x", wUsagePage ); + check_member( objinst, expect_obj, "%#04x", wUsage ); + check_member( objinst, expect_obj, "%#04x", dwDimension ); + check_member( objinst, expect_obj, "%#04x", wExponent ); + check_member( objinst, expect_obj, "%u", wReportId ); hr = IDirectInputDevice8_EnumEffects( device, NULL, NULL, DIEFT_ALL ); ok( hr == DIERR_INVALIDPARAM, "EnumEffects returned %#x\n", hr ); @@ -4397,21 +4562,25 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, DIJOFS_Y, DIPH_BYOFFSET ); ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); - check_member( objinst, expect_objects[3], "%u", dwSize ); - check_member_guid( objinst, expect_objects[3], guidType ); - check_member( objinst, expect_objects[3], "%#x", dwOfs ); - check_member( objinst, expect_objects[3], "%#x", dwType ); - check_member( objinst, expect_objects[3], "%#x", dwFlags ); - if (!localized) check_member_wstr( objinst, expect_objects[3], tszName ); - check_member( objinst, expect_objects[3], "%u", dwFFMaxForce ); - check_member( objinst, expect_objects[3], "%u", dwFFForceResolution ); - check_member( objinst, expect_objects[3], "%u", wCollectionNumber ); - check_member( objinst, expect_objects[3], "%u", wDesignatorIndex ); - check_member( objinst, expect_objects[3], "%#04x", wUsagePage ); - check_member( objinst, expect_objects[3], "%#04x", wUsage ); - check_member( objinst, expect_objects[3], "%#04x", dwDimension ); - check_member( objinst, expect_objects[3], "%#04x", wExponent ); - check_member( objinst, expect_objects[3], "%u", wReportId ); + if (version < 0x0700) expect_obj = expect_objects_5[1]; + else expect_obj = expect_objects[3]; + if (version < 0x0800) expect_obj.dwOfs = DIJOFS_Y; + check_member( objinst, expect_obj, "%u", dwSize ); + check_member_guid( objinst, expect_obj, guidType ); + todo_wine_if( version < 0x0800 ) + check_member( objinst, expect_obj, "%#x", dwOfs ); + check_member( objinst, expect_obj, "%#x", dwType ); + check_member( objinst, expect_obj, "%#x", dwFlags ); + if (!localized) check_member_wstr( objinst, expect_obj, tszName ); + check_member( objinst, expect_obj, "%u", dwFFMaxForce ); + check_member( objinst, expect_obj, "%u", dwFFForceResolution ); + check_member( objinst, expect_obj, "%u", wCollectionNumber ); + check_member( objinst, expect_obj, "%u", wDesignatorIndex ); + check_member( objinst, expect_obj, "%#04x", wUsagePage ); + check_member( objinst, expect_obj, "%#04x", wUsage ); + check_member( objinst, expect_obj, "%#04x", dwDimension ); + check_member( objinst, expect_obj, "%#04x", wExponent ); + check_member( objinst, expect_obj, "%u", wReportId ); hr = IDirectInputDevice8_SetEventNotification( device, (HANDLE)0xdeadbeef ); todo_wine @@ -4472,7 +4641,8 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); hr = IDirectInputDevice8_Poll( device ); - ok( hr == DI_NOEFFECT, "Poll returned: %#x\n", hr ); + todo_wine_if( version < 0x0700 ) + ok( hr == (version < 0x0700 ? DI_OK : DI_NOEFFECT), "Poll returned: %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2) + 1, &state ); ok( hr == DIERR_INVALIDPARAM, "GetDeviceState returned: %#x\n", hr ); @@ -4516,11 +4686,16 @@ static void test_simple_joystick(void) winetest_pop_context(); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA) - 1, objdata, &res, DIGDD_PEEK ); - todo_wine - ok( hr == DIERR_INVALIDPARAM, "GetDeviceData returned %#x\n", hr ); + size = version < 0x0800 ? sizeof(DIDEVICEOBJECTDATA_DX3) : sizeof(DIDEVICEOBJECTDATA); + hr = IDirectInputDevice8_GetDeviceData( device, size - 1, objdata, &res, DIGDD_PEEK ); + if (version < 0x0800) ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + else + { + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetDeviceData returned %#x\n", hr ); + } res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); ok( hr == DIERR_NOTBUFFERED, "GetDeviceData returned %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); @@ -4538,7 +4713,7 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); @@ -4548,12 +4723,13 @@ static void test_simple_joystick(void) ResetEvent( event ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); + todo_wine_if( version < 0x0800 ) ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); - todo_wine + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); + todo_wine_if( version >= 0x0800 ) ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); @@ -4573,22 +4749,23 @@ static void test_simple_joystick(void) ResetEvent( event ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, DIGDD_PEEK ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 1, "got %u expected %u\n", res, 1 ); check_member( objdata[0], expect_objdata[0], "%#x", dwOfs ); check_member( objdata[0], expect_objdata[0], "%#x", dwData ); - ok( objdata[0].uAppData == -1, "got %p, expected %p\n", (void *)objdata[0].uAppData, (void *)-1 ); + if (version >= 0x0800) ok( objdata[0].uAppData == -1, "got %p\n", (void *)objdata[0].uAppData ); res = 4; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 4, "got %u expected %u\n", res, 4 ); for (i = 0; i < 4; ++i) { + DIDEVICEOBJECTDATA *ptr = (DIDEVICEOBJECTDATA *)((char *)objdata + size * i); winetest_push_context( "objdata[%d]", i ); - check_member( objdata[i], expect_objdata[1 + i], "%#x", dwOfs ); - check_member( objdata[i], expect_objdata[1 + i], "%#x", dwData ); - ok( objdata[i].uAppData == -1, "got %p, expected %p\n", (void *)objdata[i].uAppData, (void *)-1 ); + check_member( *ptr, expect_objdata[1 + i], "%#x", dwOfs ); + check_member( *ptr, expect_objdata[1 + i], "%#x", dwData ); + if (version >= 0x0800) ok( ptr->uAppData == -1, "got %p\n", (void *)ptr->uAppData ); winetest_pop_context(); } @@ -4602,26 +4779,28 @@ static void test_simple_joystick(void) ResetEvent( event ); res = 1; - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); + todo_wine_if( version < 0x0800 ) ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#x\n", hr ); ok( res == 1, "got %u expected %u\n", res, 1 ); todo_wine check_member( objdata[0], expect_objdata[5], "%#x", dwOfs ); todo_wine check_member( objdata[0], expect_objdata[5], "%#x", dwData ); - ok( objdata[0].uAppData == -1, "got %p, expected %p\n", (void *)objdata[0].uAppData, (void *)-1 ); + if (version >= 0x0800) ok( objdata[0].uAppData == -1, "got %p\n", (void *)objdata[0].uAppData ); res = ARRAY_SIZE(objdata); - hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &res, 0 ); ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 8, "got %u expected %u\n", res, 8 ); for (i = 0; i < 8; ++i) { + DIDEVICEOBJECTDATA *ptr = (DIDEVICEOBJECTDATA *)((char *)objdata + size * i); winetest_push_context( "objdata[%d]", i ); todo_wine - check_member( objdata[i], expect_objdata[6 + i], "%#x", dwOfs ); + check_member( *ptr, expect_objdata[6 + i], "%#x", dwOfs ); todo_wine_if( i == 1 || i == 2 || i == 6 ) - check_member( objdata[i], expect_objdata[6 + i], "%#x", dwData ); - ok( objdata[i].uAppData == -1, "got %p, expected %p\n", (void *)objdata[i].uAppData, (void *)-1 ); + check_member( *ptr, expect_objdata[6 + i], "%#x", dwData ); + if (version >= 0x0800) ok( ptr->uAppData == -1, "got %p\n", (void *)ptr->uAppData ); winetest_pop_context(); } @@ -4719,7 +4898,9 @@ static void test_simple_joystick(void) ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr ); objdataformat[1].dwType = DIDFT_AXIS|DIDFT_MAKEINSTANCE( 0xff ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); - ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr ); + todo_wine_if( version < 0x0700 ) + ok( hr == (version < 0x0700 ? DI_OK : DIERR_INVALIDPARAM), + "SetDataFormat returned: %#x\n", hr ); objdataformat[1].dwType = DIDFT_AXIS|DIDFT_MAKEINSTANCE( 1 ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr ); @@ -4821,9 +5002,13 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetProperty( device, DIPROP_RANGE, &prop_range.diph ); ok( hr == DI_OK, "SetProperty DIPROP_RANGE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_LOGICALRANGE, &prop_range.diph ); - ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), + "SetProperty DIPROP_LOGICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_PHYSICALRANGE, &prop_range.diph ); - ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), + "SetProperty DIPROP_PHYSICALRANGE returned %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); @@ -4876,13 +5061,17 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, NULL ); ok( hr == DIERR_INVALIDPARAM, "SetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_string.diph ); - ok( hr == DIERR_INVALIDPARAM, "SetProperty returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_INVALIDPARAM), + "SetProperty DIPROP_VIDPID returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - ok( hr == DIERR_READONLY, "SetProperty DIPROP_VIDPID returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), + "SetProperty DIPROP_VIDPID returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); ok( hr == DIERR_READONLY, "SetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); @@ -4903,9 +5092,13 @@ static void test_simple_joystick(void) debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_TYPENAME, &prop_string.diph ); - ok( hr == DIERR_READONLY, "SetProperty DIPROP_TYPENAME returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), + "SetProperty DIPROP_TYPENAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_USERNAME, &prop_string.diph ); - ok( hr == DIERR_READONLY, "SetProperty DIPROP_USERNAME returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_READONLY), + "SetProperty DIPROP_USERNAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); ok( hr == DIERR_READONLY, "SetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); @@ -4924,7 +5117,8 @@ static void test_simple_joystick(void) prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); todo_wine - ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_APPDATA returned %#x\n", hr ); + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DIERR_ACQUIRED), + "SetProperty DIPROP_APPDATA returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; @@ -5039,8 +5233,8 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); winetest_push_context( "state[%d]", i ); - todo_wine - ok( state.lX == 15, "got lX %d, expected %d\n" , state.lX, 15 ); + todo_wine_if( version >= 0x0700 ) + ok( state.lX == (version < 0x0700 ? -9000 : 15), "got lX %d\n", state.lX ); check_member( state, expect_state_abs[0], "%d", lY ); check_member( state, expect_state_abs[0], "%d", lZ ); check_member( state, expect_state_abs[0], "%d", lRx ); @@ -5076,7 +5270,9 @@ static void test_simple_joystick(void) prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_pointer.uData = 0xfeedcafe; hr = IDirectInputDevice8_SetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - ok( hr == DI_OK, "SetProperty DIPROP_APPDATA returned %#x\n", hr ); + todo_wine_if( version < 0x0800 ) + ok( hr == (version < 0x0800 ? DIERR_UNSUPPORTED : DI_OK), + "SetProperty DIPROP_APPDATA returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AXISMODE, &prop_dword.diph ); @@ -5103,9 +5299,13 @@ static void test_simple_joystick(void) prop_pointer.diph.dwHow = DIPH_BYUSAGE; prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - todo_wine - ok( hr == DI_OK, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); - ok( prop_pointer.uData == 0xfeedcafe, "got %p expected %p\n", (void *)prop_pointer.uData, (void *)0xfeedcafe ); + if (version < 0x0800) ok( hr == DIERR_UNSUPPORTED, "GetProperty returned %#x\n", hr ); + else + { + todo_wine + ok( hr == DI_OK, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); + ok( prop_pointer.uData == 0xfeedcafe, "got %p expected %p\n", (void *)prop_pointer.uData, (void *)0xfeedcafe ); + } prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; @@ -5185,15 +5385,15 @@ static void test_simple_joystick(void) objdata[0].dwOfs = 0xd; objdata[0].dwData = 0x80; res = 1; - hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0xdeadbeef ); + hr = IDirectInputDevice8_SendDeviceData( device, size, objdata, &res, 0xdeadbeef ); todo_wine ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); res = 1; - hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 1 /*DISDD_CONTINUE*/ ); + hr = IDirectInputDevice8_SendDeviceData( device, size, objdata, &res, 1 /*DISDD_CONTINUE*/ ); todo_wine ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); res = 1; - hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); + hr = IDirectInputDevice8_SendDeviceData( device, size, objdata, &res, 0 ); todo_wine ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); @@ -5249,6 +5449,7 @@ done: pnp_driver_stop(); cleanup_registry_keys(); SetCurrentDirectoryW( cwd ); + winetest_pop_context(); } struct device_desc @@ -8035,6 +8236,8 @@ static void test_force_feedback_joystick( DWORD version ) {.guid = TRUE, .type = TRUE, .usage = TRUE, .name = TRUE}, {0}, {.guid = TRUE, .type = TRUE, .usage = TRUE, .name = TRUE}, + {.ofs = TRUE}, + {.ofs = TRUE}, }; struct check_objects_params check_objects_params = { @@ -10014,7 +10217,10 @@ START_TEST( hid ) test_device_types( 0x500 ); test_device_types( 0x700 ); - test_simple_joystick(); + test_simple_joystick( 0x500 ); + test_simple_joystick( 0x700 ); + test_simple_joystick( 0x800 ); + test_force_feedback_joystick( 0x500 ); test_force_feedback_joystick( 0x700 ); test_force_feedback_joystick( 0x800 ); -- 2.34.1

2 7

[PATCH v2 1/6] dinput: Simplify the internal thread and don't require loader lock.
by Rémi Bernon 03 Jan '22

03 Jan '22

When thread shuts down, instead of holding and releasing a module ref. This keeps the thread alive until the module is unloaded, instead of keeping track of live IDirectInput instances. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: winmm patches are identical to previous version, I just refactored the dinput internal thread startup and shutdown instead. It's still lazily started but simply keeps running until the module is unloaded instead of holding a module reference. dlls/dinput/dinput_main.c | 121 ++++++++++++----------------------- dlls/dinput/dinput_private.h | 3 - 2 files changed, 42 insertions(+), 82 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 55d566afa4a..cab8886f9db 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -78,9 +78,18 @@ HINSTANCE DINPUT_instance; static HWND di_em_win; -static BOOL check_hook_thread(void); +static HANDLE dinput_thread; +static DWORD dinput_thread_id; + static CRITICAL_SECTION dinput_hook_crit; -static struct list direct_input_list = LIST_INIT( direct_input_list ); +static CRITICAL_SECTION_DEBUG dinput_critsect_debug = +{ + 0, 0, &dinput_hook_crit, + { &dinput_critsect_debug.ProcessLocksList, &dinput_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": dinput_hook_crit") } +}; +static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 }; + static struct list acquired_mouse_list = LIST_INIT( acquired_mouse_list ); static struct list acquired_rawmouse_list = LIST_INIT( acquired_rawmouse_list ); static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); @@ -453,18 +462,7 @@ static HRESULT initialize_directinput_instance(IDirectInputImpl *This, DWORD dwV list_init( &This->device_players ); - /* Add self to the list of the IDirectInputs */ - EnterCriticalSection( &dinput_hook_crit ); - list_add_head( &direct_input_list, &This->entry ); - LeaveCriticalSection( &dinput_hook_crit ); - This->initialized = TRUE; - - if (!check_hook_thread()) - { - uninitialize_directinput_instance( This ); - return DIERR_GENERIC; - } } return DI_OK; @@ -475,17 +473,11 @@ static void uninitialize_directinput_instance(IDirectInputImpl *This) if (This->initialized) { struct DevicePlayer *device_player, *device_player2; - /* Remove self from the list of the IDirectInputs */ - EnterCriticalSection( &dinput_hook_crit ); - list_remove( &This->entry ); - LeaveCriticalSection( &dinput_hook_crit ); LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, &This->device_players, struct DevicePlayer, entry ) free( device_player ); - check_hook_thread(); - This->initialized = FALSE; } } @@ -1262,13 +1254,13 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam return CallNextHookEx( 0, code, wparam, lparam ); } -static DWORD WINAPI hook_thread_proc(void *param) +static DWORD WINAPI dinput_thread_proc( void *params ) { + HANDLE events[128], start_event = params; static HHOOK kbd_hook, mouse_hook; struct dinput_device *impl, *next; SIZE_T events_count = 0; HANDLE finished_event; - HANDLE events[128]; HRESULT hr; DWORD ret; MSG msg; @@ -1277,7 +1269,7 @@ static DWORD WINAPI hook_thread_proc(void *param) /* Force creation of the message queue */ PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); - SetEvent(param); + SetEvent( start_event ); while ((ret = MsgWaitForMultipleObjectsEx( events_count, events, INFINITE, QS_ALLINPUT, 0 )) <= events_count) { @@ -1354,61 +1346,36 @@ static DWORD WINAPI hook_thread_proc(void *param) done: DestroyWindow( di_em_win ); di_em_win = NULL; - - FreeLibraryAndExitThread(DINPUT_instance, 0); + return 0; } -static DWORD hook_thread_id; -static HANDLE hook_thread_event; - -static CRITICAL_SECTION_DEBUG dinput_critsect_debug = +static BOOL WINAPI dinput_thread_start_once( INIT_ONCE *once, void *param, void **context ) { - 0, 0, &dinput_hook_crit, - { &dinput_critsect_debug.ProcessLocksList, &dinput_critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": dinput_hook_crit") } -}; -static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 }; + HANDLE start_event; -static BOOL check_hook_thread(void) + start_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + if (!start_event) ERR( "failed to create start event, error %u\n", GetLastError() ); + + dinput_thread = CreateThread( NULL, 0, dinput_thread_proc, start_event, 0, &dinput_thread_id ); + if (!dinput_thread) ERR( "failed to create internal thread, error %u\n", GetLastError() ); + + WaitForSingleObject( start_event, INFINITE ); + CloseHandle( start_event ); + + return TRUE; +} + +static void dinput_thread_start(void) { - static HANDLE hook_thread; - HMODULE module; - HANDLE wait_handle = NULL; + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce( &init_once, dinput_thread_start_once, NULL, NULL ); +} - EnterCriticalSection(&dinput_hook_crit); - - TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); - if (!list_empty(&direct_input_list) && !hook_thread) - { - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)DINPUT_instance, &module); - hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); - hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); - } - else if (list_empty(&direct_input_list) && hook_thread) - { - DWORD tid = hook_thread_id; - - if (hook_thread_event) /* if thread is not started yet */ - { - WaitForSingleObject(hook_thread_event, INFINITE); - CloseHandle(hook_thread_event); - hook_thread_event = NULL; - } - - hook_thread_id = 0; - PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - wait_handle = hook_thread; - hook_thread = NULL; - } - - LeaveCriticalSection(&dinput_hook_crit); - - if (wait_handle) - { - WaitForSingleObject(wait_handle, INFINITE); - CloseHandle(wait_handle); - } - return hook_thread_id != 0; +static void dinput_thread_stop(void) +{ + PostThreadMessageW( dinput_thread_id, WM_USER + 0x10, 0, 0 ); + WaitForSingleObject( dinput_thread, INFINITE ); + CloseHandle( dinput_thread ); } void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) @@ -1418,6 +1385,8 @@ void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); HANDLE hook_change_finished_event = NULL; + dinput_thread_start(); + EnterCriticalSection(&dinput_hook_crit); if (impl->dwCoopLevel & DISCL_FOREGROUND) @@ -1437,13 +1406,6 @@ void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) callwndproc_hook = NULL; } - if (hook_thread_event) /* if thread is not started yet */ - { - WaitForSingleObject(hook_thread_event, INFINITE); - CloseHandle(hook_thread_event); - hook_thread_event = NULL; - } - if (impl->use_raw_input) { if (acquired) @@ -1470,7 +1432,7 @@ void check_dinput_hooks( IDirectInputDevice8W *iface, BOOL acquired ) } hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); - PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); + PostThreadMessageW( dinput_thread_id, WM_USER + 0x10, 1, (LPARAM)hook_change_finished_event ); LeaveCriticalSection(&dinput_hook_crit); @@ -1505,6 +1467,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; + dinput_thread_stop(); unregister_di_em_win_class(); DeleteCriticalSection(&dinput_hook_crit); break; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index c25fe6320ca..4b36a69c0e1 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -40,10 +40,7 @@ struct IDirectInputImpl IDirectInputJoyConfig8 IDirectInputJoyConfig8_iface; LONG ref; - BOOL initialized; - struct list entry; /* entry into list of all IDirectInputs */ - DWORD evsequence; /* unique sequence number for events */ DWORD dwVersion; /* direct input version number */ struct list device_players; /* device instance guid to player name */ -- 2.34.0

2 7

[PATCH] include: Add SL_ERROR_RETURNED
by Alex Henrie 03 Jan '22

03 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I noticed that this was missing while investigating a testbot failure. --- include/ddk/wdm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b798d339561..d00acf5b782 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -961,6 +961,7 @@ typedef NTSTATUS (WINAPI *PIO_COMPLETION_ROUTINE)( IN PVOID Context); #define SL_PENDING_RETURNED 0x01 +#define SL_ERROR_RETURNED 0x02 #define SL_INVOKE_ON_CANCEL 0x20 #define SL_INVOKE_ON_SUCCESS 0x40 #define SL_INVOKE_ON_ERROR 0x80 -- 2.34.1

1 0

[PATCH] faultrep/tests: Remove registry writability check
by Alex Henrie 03 Jan '22

03 Jan '22

This check isn't needed anymore either. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/faultrep/tests/faultrep.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index c71db80cdbb..41f03ee8870 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -72,11 +72,6 @@ static void test_AddERExcludedApplicationA(void) /* clean state */ lres = RegCreateKeyA(HKEY_LOCAL_MACHINE, regpath_root, &hroot); - if (lres == ERROR_ACCESS_DENIED) - { - skip("Not enough access rights\n"); - return; - } if (!lres) lres = RegOpenKeyA(hroot, regpath_exclude, &hexclude); -- 2.34.1

1 0

Wine staging 7.0-rc4 release
by Alistair Leslie-Hughes 03 Jan '22

03 Jan '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.0-rc4 (552 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/2] faultrep/tests: Drop workarounds for Windows <= 2000
by Alex Henrie 03 Jan '22

03 Jan '22

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/faultrep/tests/faultrep.c | 62 ++++------------------------------ 1 file changed, 6 insertions(+), 56 deletions(-) diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index d0b30f70cf1..30664bd29be 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -36,65 +36,15 @@ static const char regpath_exclude[] = "ExclusionList"; static BOOL is_process_limited(void) { - static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL) = NULL; - static BOOL (WINAPI *pOpenProcessToken)(HANDLE, DWORD, PHANDLE) = NULL; - SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; - BOOL IsInGroup; HANDLE token; + TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; + DWORD size; - if (!pOpenProcessToken) - { - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); - pOpenProcessToken = (void*)GetProcAddress(hadvapi32, "OpenProcessToken"); - pCheckTokenMembership = (void*)GetProcAddress(hadvapi32, "CheckTokenMembership"); - if (!pCheckTokenMembership || !pOpenProcessToken) - { - /* Win9x (power to the masses) or NT4 (no way to know) */ - trace("missing pOpenProcessToken or CheckTokenMembership\n"); - return FALSE; - } - } - - if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is an administrator\n"); - return FALSE; - } - FreeSid(Group); - if (!IsInGroup) - { - if (!AllocateAndInitializeSid(&NtAuthority, 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_POWER_USERS, - 0, 0, 0, 0, 0, 0, &Group) || - !pCheckTokenMembership(NULL, Group, &IsInGroup)) - { - trace("Could not check if the current user is a power user\n"); - return FALSE; - } - FreeSid(Group); - if (!IsInGroup) - { - /* Only administrators and power users can be powerful */ - return TRUE; - } - } + OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); + CloseHandle(token); - if (pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token)) - { - BOOL ret; - TOKEN_ELEVATION_TYPE type = TokenElevationTypeDefault; - DWORD size; - - ret = GetTokenInformation(token, TokenElevationType, &type, sizeof(type), &size); - CloseHandle(token); - return (ret && type == TokenElevationTypeLimited); - } - return FALSE; + return type == TokenElevationTypeLimited; } -- 2.34.1

2 3

[PATCH] dmsynth/tests: Clarify the sink init / synth latency clock relationship
by Michael Stefaniuc 02 Jan '22

02 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Found while wondering why SetSynthSink() is not calling the sink's Init() method but GetLatencyClock(). The documentation states that the timing related methods should be passed on to the sink. https://docs.microsoft.com/en-us/windows-hardware/drivers/audio/idirectmusi… dlls/dmsynth/tests/dmsynth.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 3ddf40817a5..3970933cb6f 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -44,6 +44,13 @@ static BOOL missing_dmsynth(void) return TRUE; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; @@ -52,6 +59,7 @@ static void test_dmsynth(void) IReferenceClock* clock_sink = NULL; IKsControl* control_synth = NULL; IKsControl* control_sink = NULL; + ULONG ref_clock_synth, ref_clock_sink; HRESULT hr; KSPROPERTY property; ULONG value; @@ -104,6 +112,10 @@ static void test_dmsynth(void) ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); ok(value == TRUE, "Return value: %u, should be 1\n", value); + /* Synth isn't fully initialized yet */ + hr = IDirectMusicSynth_Activate(dmsynth, TRUE); + todo_wine ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %x\n", hr); + /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); @@ -112,8 +124,9 @@ static void test_dmsynth(void) hr = IDirectMusicSynthSink_GetLatencyClock(dmsynth_sink, &clock_sink); ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); ok(clock_sink != NULL, "No clock returned\n"); + ref_clock_sink = get_refcount(clock_sink); - /* This will set clock to Synth */ + /* This will Init() the SynthSink and finish initializing the Synth */ hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); @@ -122,6 +135,8 @@ static void test_dmsynth(void) ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); ok(clock_synth != NULL, "No clock returned\n"); ok(clock_synth == clock_sink, "Synth and SynthSink clocks are not the same\n"); + ref_clock_synth = get_refcount(clock_synth); + ok(ref_clock_synth > ref_clock_sink + 1, "Latency clock refcount didn't increase\n"); if (control_synth) IDirectMusicSynth_Release(control_synth); -- 2.31.1

1 0

[PATCH] comctl32: Fix return type of ImageList_WriteEx.
by Roman Pišl 02 Jan '22

02 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52323 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/comctl32/imagelist.c | 4 ++-- include/commctrl.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 8da8beec1e0..155d4b2a956 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3061,10 +3061,10 @@ failed: /************************************************************************* * ImageList_WriteEx [COMCTL32.@] */ -BOOL WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) +HRESULT WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) { FIXME("%p %08x %p: semi-stub\n", himl, flags, pstm); - return ImageList_Write(himl, pstm); + return ImageList_Write(himl, pstm) ? S_OK : E_FAIL; } /************************************************************************* diff --git a/include/commctrl.h b/include/commctrl.h index 025eb328c32..c6d9dd32928 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -602,7 +602,7 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT); #ifdef __IStream_INTERFACE_DEFINED__ HIMAGELIST WINAPI ImageList_Read(LPSTREAM); BOOL WINAPI ImageList_Write(HIMAGELIST,IStream*); -BOOL WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); +HRESULT WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); #endif #define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon) -- 2.30.2

1 0

[PATCH v2] po: Update Simplified Chinese translation.
by Jactry Zeng 02 Jan '22

02 Jan '22

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- Superseded patch 222804. --- po/zh_CN.po | 1868 ++++++++++++++++++++++----------------------------- 1 file changed, 808 insertions(+), 1060 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e4860d4f83e..469fc90c91e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-12-15 16:24+0800\n" +"PO-Revision-Date: 2022-01-03 00:36+0800\n" "Last-Translator: Jactry Zeng <jzeng(a)codeweavers.com>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" @@ -21,26 +21,20 @@ msgid "Security" msgstr "安全" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "用户名(&U)：" +msgstr "用户组或用户名(&G):" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "黄色" +msgstr "允许" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "拒绝" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "没有权限" +msgstr "%1 的权限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -122,39 +116,39 @@ msgstr "确定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技术支持信息：" +msgstr "以下信息可用于寻求 %s 的技术支持:" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生产商：" +msgstr "生产商:" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" -msgstr "版本：" +msgstr "版本:" #: dlls/appwiz.cpl/appwiz.rc:82 msgid "Contact:" -msgstr "联系人：" +msgstr "联系人:" #: dlls/appwiz.cpl/appwiz.rc:83 msgid "Support Information:" -msgstr "支持信息：" +msgstr "支持信息:" #: dlls/appwiz.cpl/appwiz.rc:84 msgid "Support Telephone:" -msgstr "支持电话：" +msgstr "支持电话:" #: dlls/appwiz.cpl/appwiz.rc:85 msgid "Readme:" -msgstr "产品说明：" +msgstr "产品说明:" #: dlls/appwiz.cpl/appwiz.rc:86 msgid "Product Updates:" -msgstr "产品更新：" +msgstr "产品更新:" #: dlls/appwiz.cpl/appwiz.rc:87 msgid "Comments:" -msgstr "备注：" +msgstr "备注:" #: dlls/appwiz.cpl/appwiz.rc:100 msgid "Wine Gecko Installer" @@ -251,7 +245,7 @@ msgstr "添加/删除程序" msgid "" "Allows you to install new software, or remove existing software from your " "computer." -msgstr "允许你安装新软件或删除现有程序。" +msgstr "允许您安装新软件，或从您的计算机删除现有的软件。" #: dlls/appwiz.cpl/appwiz.rc:33 programs/taskmgr/taskmgr.rc:262 #: programs/winecfg/winecfg.rc:32 @@ -322,7 +316,7 @@ msgstr "压缩选项" #: dlls/avifil32/avifil32.rc:45 msgid "&Choose a stream:" -msgstr "选择来源流(&C)：" +msgstr "选择来源流(&C):" #: dlls/avifil32/avifil32.rc:48 programs/wordpad/wordpad.rc:76 msgid "&Options..." @@ -330,7 +324,7 @@ msgstr "选项(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交织(&I)：每" +msgstr "交织(&I): 每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -338,11 +332,11 @@ msgstr "帧数" #: dlls/avifil32/avifil32.rc:52 msgid "Current format:" -msgstr "当前格式：" +msgstr "当前格式:" #: dlls/avifil32/avifil32.rc:30 msgid "Waveform: %s" -msgstr "波形：%s" +msgstr "波形: %s" #: dlls/avifil32/avifil32.rc:31 msgid "Waveform" @@ -467,7 +461,7 @@ msgstr "下移(&D)" #: dlls/comctl32/comctl32.rc:105 msgid "A&vailable buttons:" -msgstr "可用工具栏按钮(&V)：" +msgstr "可用工具栏按钮(&V):" #: dlls/comctl32/comctl32.rc:107 msgid "&Add ->" @@ -479,7 +473,7 @@ msgstr "<- 删除(&R)" #: dlls/comctl32/comctl32.rc:109 msgid "&Toolbar buttons:" -msgstr "当前工具栏按钮(&T)：" +msgstr "当前工具栏按钮(&T):" #: dlls/comctl32/comctl32.rc:42 msgid "Separator" @@ -521,7 +515,7 @@ msgstr "关闭" #: dlls/comctl32/comctl32.rc:36 msgid "Today:" -msgstr "今天：" +msgstr "今天:" #: dlls/comctl32/comctl32.rc:37 msgid "Go to today" @@ -536,19 +530,19 @@ msgstr "打开" #: dlls/comdlg32/comdlg32.rc:161 dlls/comdlg32/comdlg32.rc:183 msgid "File &Name:" -msgstr "文件名(&N)：" +msgstr "文件名(&N):" #: dlls/comdlg32/comdlg32.rc:164 dlls/comdlg32/comdlg32.rc:186 msgid "&Directories:" -msgstr "文件夹(&D)：" +msgstr "文件夹(&D):" #: dlls/comdlg32/comdlg32.rc:167 dlls/comdlg32/comdlg32.rc:189 msgid "List Files of &Type:" -msgstr "文件类型(&T)：" +msgstr "文件类型(&T):" #: dlls/comdlg32/comdlg32.rc:169 dlls/comdlg32/comdlg32.rc:191 msgid "Dri&ves:" -msgstr "驱动器(&V)：" +msgstr "驱动器(&V):" #: dlls/comdlg32/comdlg32.rc:174 dlls/comdlg32/comdlg32.rc:196 #: dlls/shell32/shell32.rc:368 dlls/shell32/shell32.rc:405 @@ -572,7 +566,7 @@ msgstr "打印" #: dlls/comdlg32/comdlg32.rc:205 msgid "Printer:" -msgstr "打印机：" +msgstr "打印机:" #: dlls/comdlg32/comdlg32.rc:207 dlls/comdlg32/comdlg32.rc:375 msgid "Print range" @@ -597,15 +591,15 @@ msgstr "设置(&S)" #: dlls/comdlg32/comdlg32.rc:214 msgid "&From:" -msgstr "从(&F)：" +msgstr "从(&F):" #: dlls/comdlg32/comdlg32.rc:215 msgid "&To:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:216 dlls/wineps.drv/wineps.rc:42 msgid "Print &Quality:" -msgstr "打印质量(&Q)：" +msgstr "打印质量(&Q):" #: dlls/comdlg32/comdlg32.rc:218 msgid "Print to Fi&le" @@ -669,16 +663,16 @@ msgstr "字体" #: dlls/comdlg32/comdlg32.rc:254 msgid "&Font:" -msgstr "字体(&F)：" +msgstr "字体(&F):" #: dlls/comdlg32/comdlg32.rc:257 msgid "Font St&yle:" -msgstr "字体样式(&Y)：" +msgstr "字体样式(&Y):" #: dlls/comdlg32/comdlg32.rc:260 dlls/comdlg32/comdlg32.rc:439 #: programs/winecfg/winecfg.rc:292 msgid "&Size:" -msgstr "大小(&S)：" +msgstr "大小(&S):" #: dlls/comdlg32/comdlg32.rc:267 msgid "Effects" @@ -694,7 +688,7 @@ msgstr "下划线(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "配色(&C):" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -710,11 +704,11 @@ msgstr "颜色" #: dlls/comdlg32/comdlg32.rc:286 msgid "&Basic Colors:" -msgstr "基本颜色(&B)：" +msgstr "基本颜色(&B):" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定义颜色(&C)：" +msgstr "自定义颜色(&C):" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" @@ -722,29 +716,29 @@ msgstr "|纯色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" -msgstr "红(&R)：" +msgstr "红(&R):" #: dlls/comdlg32/comdlg32.rc:292 msgid "&Green:" -msgstr "绿(&G)：" +msgstr "绿(&G):" #: dlls/comdlg32/comdlg32.rc:294 msgid "&Blue:" -msgstr "蓝(&B)：" +msgstr "蓝(&B):" #: dlls/comdlg32/comdlg32.rc:296 msgid "&Hue:" -msgstr "色调(&E)：" +msgstr "色调(&E):" #: dlls/comdlg32/comdlg32.rc:298 msgctxt "Saturation" msgid "&Sat:" -msgstr "饱和度(&S)：" +msgstr "饱和度(&S):" #: dlls/comdlg32/comdlg32.rc:300 msgctxt "Luminance" msgid "&Lum:" -msgstr "亮度(&L)：" +msgstr "亮度(&L):" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" @@ -766,7 +760,7 @@ msgstr "查找" #: dlls/comdlg32/comdlg32.rc:321 dlls/comdlg32/comdlg32.rc:340 msgid "Fi&nd What:" -msgstr "查找(&N)：" +msgstr "查找(&N):" #: dlls/comdlg32/comdlg32.rc:323 dlls/comdlg32/comdlg32.rc:344 msgid "Match &Whole Word Only" @@ -798,7 +792,7 @@ msgstr "替换" #: dlls/comdlg32/comdlg32.rc:342 msgid "Re&place With:" -msgstr "替换为(&P)：" +msgstr "替换为(&P):" #: dlls/comdlg32/comdlg32.rc:348 msgid "&Replace" @@ -822,23 +816,23 @@ msgstr "打印到文件(&L)" #: dlls/comdlg32/comdlg32.rc:365 dlls/comdlg32/comdlg32.rc:401 #: dlls/msacm32/msacm32.rc:34 programs/winefile/winefile.rc:137 msgid "&Name:" -msgstr "名称(&N)：" +msgstr "名称(&N):" #: dlls/comdlg32/comdlg32.rc:366 dlls/comdlg32/comdlg32.rc:404 msgid "Status:" -msgstr "状态：" +msgstr "状态:" #: dlls/comdlg32/comdlg32.rc:368 dlls/comdlg32/comdlg32.rc:406 msgid "Type:" -msgstr "型号：" +msgstr "型号:" #: dlls/comdlg32/comdlg32.rc:370 dlls/comdlg32/comdlg32.rc:408 msgid "Where:" -msgstr "位置：" +msgstr "位置:" #: dlls/comdlg32/comdlg32.rc:372 dlls/comdlg32/comdlg32.rc:410 msgid "Comment:" -msgstr "备注：" +msgstr "备注:" #: dlls/comdlg32/comdlg32.rc:377 msgid "Pa&ges" @@ -850,11 +844,11 @@ msgstr "选中的范围(&S)" #: dlls/comdlg32/comdlg32.rc:381 msgid "&from:" -msgstr "从(&F)：" +msgstr "从(&F):" #: dlls/comdlg32/comdlg32.rc:382 msgid "&to:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:384 msgid "Copies" @@ -862,7 +856,7 @@ msgstr "份数" #: dlls/comdlg32/comdlg32.rc:385 msgid "Number of &copies:" -msgstr "份数(&C)：" +msgstr "份数(&C):" #: dlls/comdlg32/comdlg32.rc:387 msgid "C&ollate" @@ -874,7 +868,7 @@ msgstr "大小(&Z):" #: dlls/comdlg32/comdlg32.rc:416 msgid "&Source:" -msgstr "纸张来源(&S)：" +msgstr "纸张来源(&S):" #: dlls/comdlg32/comdlg32.rc:421 msgid "P&ortrait" @@ -890,7 +884,7 @@ msgstr "页面设置" #: dlls/comdlg32/comdlg32.rc:441 msgid "&Tray:" -msgstr "托盘(&T)：" +msgstr "托盘(&T):" #: dlls/comdlg32/comdlg32.rc:444 dlls/wineps.drv/wineps.rc:35 msgid "&Portrait" @@ -898,19 +892,19 @@ msgstr "纵向(&P)" #: dlls/comdlg32/comdlg32.rc:447 msgid "L&eft:" -msgstr "左(&E)：" +msgstr "左(&E):" #: dlls/comdlg32/comdlg32.rc:449 programs/notepad/notepad.rc:112 msgid "&Right:" -msgstr "右(&R)：" +msgstr "右(&R):" #: dlls/comdlg32/comdlg32.rc:451 msgid "T&op:" -msgstr "上(&O)：" +msgstr "上(&O):" #: dlls/comdlg32/comdlg32.rc:453 programs/notepad/notepad.rc:114 msgid "&Bottom:" -msgstr "下(&B)：" +msgstr "下(&B):" #: dlls/comdlg32/comdlg32.rc:457 msgid "P&rinter..." @@ -918,7 +912,7 @@ msgstr "打印机(&P)..." #: dlls/comdlg32/comdlg32.rc:465 dlls/comdlg32/comdlg32.rc:490 msgid "Look &in:" -msgstr "浏览(&I)：" +msgstr "浏览(&I):" #: dlls/comdlg32/comdlg32.rc:471 dlls/comdlg32/comdlg32.rc:497 msgid "File &name:" @@ -926,7 +920,7 @@ msgstr "文件名(&N):" #: dlls/comdlg32/comdlg32.rc:475 dlls/comdlg32/comdlg32.rc:501 msgid "Files of &type:" -msgstr "文件类型(&T)：" +msgstr "文件类型(&T):" #: dlls/comdlg32/comdlg32.rc:478 dlls/comdlg32/comdlg32.rc:504 msgid "Open as &read-only" @@ -940,11 +934,11 @@ msgstr "打开(&O)" #: dlls/comdlg32/comdlg32.rc:517 msgid "File name:" -msgstr "文件名：" +msgstr "文件名:" #: dlls/comdlg32/comdlg32.rc:520 msgid "Files of type:" -msgstr "文件类型：" +msgstr "文件类型:" #: dlls/comdlg32/comdlg32.rc:33 dlls/vbscript/vbscript.rc:35 msgid "File not found" @@ -960,7 +954,7 @@ msgid "" "Do you want to create file?" msgstr "" "文件不存在。\n" -"是否创建新文件？" +"是否创建新文件?" #: dlls/comdlg32/comdlg32.rc:36 msgid "" @@ -968,7 +962,7 @@ msgid "" "Do you want to replace it?" msgstr "" "文件已经存在。\n" -"是否替换？" +"是否替换?" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" @@ -979,7 +973,7 @@ msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"文件名中不能包含任何以下字符：\n" +"文件名中不能包含任何以下字符:\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 @@ -1128,7 +1122,7 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"你的打印机不支持这么大的份数。\n" +"您的打印机不支持这么大的份数。\n" "请输入一个 1 和 %d 之间的数。" #: dlls/comdlg32/comdlg32.rc:68 @@ -1171,7 +1165,7 @@ msgstr "保存(&S)" #: dlls/comdlg32/comdlg32.rc:144 msgid "Save &in:" -msgstr "保存在(&I)：" +msgstr "保存在(&I):" #: dlls/comdlg32/comdlg32.rc:145 msgid "Save" @@ -1316,12 +1310,12 @@ msgstr "毫米" #: dlls/credui/credui.rc:45 msgid "&User name:" -msgstr "用户名(&U)：" +msgstr "用户名(&U):" #: dlls/credui/credui.rc:48 dlls/cryptui/cryptui.rc:402 #: dlls/oledb32/version.rc:81 msgid "&Password:" -msgstr "密码(&P)：" +msgstr "密码(&P):" #: dlls/credui/credui.rc:50 msgid "&Remember my password" @@ -1344,7 +1338,7 @@ msgid "" "Make sure that your user name\n" "and password are correct." msgstr "" -"请确认你输入的用户名和密码\n" +"请确认您输入的用户名和密码\n" "是否正确。" #: dlls/credui/credui.rc:35 @@ -1354,9 +1348,9 @@ msgid "" "Press the Caps Lock key on your keyboard to turn off Caps Lock before\n" "entering your password." msgstr "" -"开着大写锁定可能导致你输入错误的密码。\n" +"开着大写锁定可能导致您输入错误的密码。\n" "\n" -"建议你按下键盘上的 Caps Lock 键以关闭大写锁定，然后再输入密码。" +"建议您按下键盘上的 Caps Lock 键以关闭大写锁定，然后再输入密码。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1541,7 +1535,7 @@ msgstr "组织单元" #: dlls/crypt32/crypt32.rc:74 msgid "Common Name" -msgstr "通用名" +msgstr "公用名" #: dlls/crypt32/crypt32.rc:75 msgid "Locality" @@ -2188,7 +2182,7 @@ msgstr "证书策略" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略标识符：" +msgstr "策略标识符:" #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" @@ -2234,7 +2228,7 @@ msgstr "颁发者声明(&S)" #: dlls/cryptui/cryptui.rc:205 msgid "&Show:" -msgstr "显示(&S)：" +msgstr "显示(&S):" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." @@ -2258,7 +2252,7 @@ msgstr "查看证书(&V)" #: dlls/cryptui/cryptui.rc:223 msgid "Certificate &status:" -msgstr "证书状态(&S)：" +msgstr "证书状态(&S):" #: dlls/cryptui/cryptui.rc:229 msgid "Disclaimer" @@ -2270,12 +2264,12 @@ msgstr "更多信息(&I)" #: dlls/cryptui/cryptui.rc:244 msgid "&Friendly name:" -msgstr "易记名称(&F)：" +msgstr "易记名称(&F):" #: dlls/cryptui/cryptui.rc:246 programs/progman/progman.rc:154 #: programs/progman/progman.rc:170 msgid "&Description:" -msgstr "描述(&D)：" +msgstr "描述(&D):" #: dlls/cryptui/cryptui.rc:248 msgid "Certificate purposes" @@ -2291,7 +2285,7 @@ msgstr "禁用此证书的所有用途(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "仅启用此证书的如下用途(&O)：" +msgstr "仅启用此证书的如下用途(&O):" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." @@ -2304,7 +2298,7 @@ msgstr "添加用途" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "为您要添加的证书用途添加对象识别 (OID) ：" +msgstr "为您要添加的证书用途添加对象识别 (OID):" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" @@ -2349,7 +2343,7 @@ msgstr "" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: dlls/cryptui/cryptui.rc:301 dlls/cryptui/cryptui.rc:323 #: dlls/cryptui/cryptui.rc:437 programs/winecfg/winecfg.rc:311 @@ -2360,7 +2354,7 @@ msgstr "浏览(&R)..." msgid "" "Note: The following file formats may contain more than one certificate, " "certificate revocation list, or certificate trust list:" -msgstr "注意：如下格式的文件可能包含多个证书、证书吊销列表或证书信任列表：" +msgstr "注意: 如下格式的文件可能包含多个证书、证书吊销列表或证书信任列表:" #: dlls/cryptui/cryptui.rc:304 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" @@ -2387,7 +2381,7 @@ msgstr "自动选择证书存储(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "将所有证书放入此存储(&P)：" +msgstr "将所有证书放入此存储(&P):" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2399,7 +2393,7 @@ msgstr "您已成功完成证书导入向导。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" -msgstr "您已指定如下设置：" +msgstr "您已指定如下设置:" #: dlls/cryptui/cryptui.rc:342 dlls/cryptui/cryptui.rc:122 #: dlls/inetcpl.cpl/inetcpl.rc:111 @@ -2408,7 +2402,7 @@ msgstr "证书" #: dlls/cryptui/cryptui.rc:345 msgid "I&ntended purpose:" -msgstr "预期用途：" +msgstr "预期用途:" #: dlls/cryptui/cryptui.rc:349 msgid "&Import..." @@ -2451,7 +2445,7 @@ msgstr "选择一个或多个在选中高级用途后要列出的用途。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" -msgstr "证书用途(&C)：" +msgstr "证书用途(&C):" #: dlls/cryptui/cryptui.rc:375 dlls/cryptui/cryptui.rc:386 #: dlls/cryptui/cryptui.rc:399 dlls/cryptui/cryptui.rc:409 @@ -2491,7 +2485,7 @@ msgstr "如果您选择导出私钥，将提示您创建密码以保护后页的 #: dlls/cryptui/cryptui.rc:390 msgid "Do you wish to export the private key?" -msgstr "您希望导出私钥吗？" +msgstr "您希望导出私钥吗?" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" @@ -2503,11 +2497,11 @@ msgstr "否，不要导出私钥(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" -msgstr "确认密码(&C)：" +msgstr "确认密码(&C):" #: dlls/cryptui/cryptui.rc:412 msgid "Select the format you want to use:" -msgstr "选择您希望使用的格式：" +msgstr "选择您希望使用的格式:" #: dlls/cryptui/cryptui.rc:413 msgid "&DER-encoded X.509 (*.cer)" @@ -2515,7 +2509,7 @@ msgstr "&DER 加密的 X.509 (*.cer)" #: dlls/cryptui/cryptui.rc:415 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64 加密的 X.509 (*.cer)：" +msgstr "Ba&se64 加密的 X.509 (*.cer):" #: dlls/cryptui/cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2591,15 +2585,15 @@ msgstr "证书的所有预期用途均无法验证。" #: dlls/cryptui/cryptui.rc:37 msgid "This certificate is intended for the following purposes:" -msgstr "该证书的预期用途如下：" +msgstr "该证书的预期用途如下:" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "颁发给：" +msgstr "颁发给: " #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "颁发者：" +msgstr "颁发者: " #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2684,7 +2678,7 @@ msgstr "公钥" #: dlls/cryptui/cryptui.rc:61 msgid "%1 (%2!d! bits)" -msgstr "%1（%2!d! 位）" +msgstr "%1 (%2!d! 位)" #: dlls/cryptui/cryptui.rc:62 msgid "SHA1 hash" @@ -2692,7 +2686,7 @@ msgstr "SHA1 哈希值" #: dlls/cryptui/cryptui.rc:63 msgid "Enhanced key usage (property)" -msgstr "增强密钥用途（财产）" +msgstr "增强密钥用途 (属性)" #: dlls/cryptui/cryptui.rc:64 msgid "Friendly name" @@ -2854,7 +2848,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您已不能使用此证书解密或签名消息。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:111 msgid "" @@ -2863,7 +2857,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您已不能使用这些证书解密或签名消息。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:112 msgid "" @@ -2872,7 +2866,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您已不能使用此证书加密或校验消息。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:113 msgid "" @@ -2881,7 +2875,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您已不能使用这些证书加密或校验消息。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:114 msgid "" @@ -2890,7 +2884,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "将不再信任由此证书颁发机构颁发的证书。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:115 msgid "" @@ -2899,7 +2893,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "将不再信任由这些证书颁发机构颁发的证书。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:116 msgid "" @@ -2908,7 +2902,7 @@ msgid "" "Are you sure you want to remove this trusted root certificate?" msgstr "" "将不再信任由此根证书颁发机构颁发的证书或证书颁发机构。\n" -"您确实要移除此已信任的根证书吗？" +"您确实要移除此已信任的根证书吗?" #: dlls/cryptui/cryptui.rc:117 msgid "" @@ -2917,7 +2911,7 @@ msgid "" "Are you sure you want to remove these trusted root certificates?" msgstr "" "将不再信任由这些根证书颁发机构颁发的证书或证书颁发机构。\n" -"您确实要移除这些已信任的根证书吗？" +"您确实要移除这些已信任的根证书吗?" #: dlls/cryptui/cryptui.rc:118 msgid "" @@ -2925,7 +2919,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "将不再信任由此发行商签名的软件。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:119 msgid "" @@ -2933,15 +2927,15 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "将不再信任由这些发行商签名的软件。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" -msgstr "您确实要移除此证书吗？" +msgstr "您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:121 msgid "Are you sure you want to remove these certificates?" -msgstr "您确实要移除这些证书吗？" +msgstr "您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" @@ -3001,7 +2995,7 @@ msgstr "指定用于保存内容的文件名称。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "指定文件已经存在。是否替换？" +msgstr "指定文件已经存在。您要替换它吗?" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3063,11 +3057,11 @@ msgstr "密码不一致。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." -msgstr "注意：无法打开该证书的私钥。" +msgstr "注意: 无法打开该证书的私钥。" #: dlls/cryptui/cryptui.rc:176 msgid "Note: The private key for this certificate is not exportable." -msgstr "注意：证书的私钥不可导出。" +msgstr "注意: 证书的私钥不可导出。" #: dlls/cryptui/cryptui.rc:177 msgid "Intended Use" @@ -3456,7 +3450,7 @@ msgstr "请指定您希望在 Internet Explorer 中打开的 URL" #: dlls/ieframe/ieframe.rc:94 msgid "Open:" -msgstr "打开：" +msgstr "打开:" #: dlls/ieframe/ieframe.rc:70 msgctxt "home page" @@ -3604,7 +3598,7 @@ msgstr "使用自动代理服务器配置 (PAC) 脚本" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 msgid "Address:" -msgstr "地址：" +msgstr "地址:" #: dlls/inetcpl.cpl/inetcpl.rc:130 msgid "Proxy server" @@ -3616,7 +3610,7 @@ msgstr "使用代理服务器" #: dlls/inetcpl.cpl/inetcpl.rc:134 msgid "Port:" -msgstr "端口：" +msgstr "端口:" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3628,7 +3622,7 @@ msgstr "配置 Wine Internet Explorer 以及相关设置" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "此区域的安全设置：" +msgstr "此区域的安全设置: " #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3663,30 +3657,24 @@ msgid "&Disable" msgstr "停用(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "重设" +msgstr "重置(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "启用(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "编辑顶替" +msgstr "重写(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "已连接" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "语音输入设备：" +msgstr "已连接 (xinput 设备)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3930,21 +3918,19 @@ msgstr "无法在此对象上更改属性描述符中的“writable”属性为 #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "无法定义属性 '|': 对象不可扩展" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" -msgstr "无法重定义不可配置的属性“|”" +msgstr "无法重定义不可配置的属性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "无法更改不可写的属性“|”" +msgstr "无法更改不可写的属性 '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[object]' 不是日期对象" +msgstr "'this' 不是 Map 对象" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -4785,19 +4771,19 @@ msgstr "注册表损坏。\n" #: dlls/kernel32/winerror.mc:1068 msgid "Invalid key.\n" -msgstr "无效的键。\n" +msgstr "无效的项。\n" #: dlls/kernel32/winerror.mc:1073 msgid "Can't open registry key.\n" -msgstr "无法打开注册表键。\n" +msgstr "无法打开注册表项。\n" #: dlls/kernel32/winerror.mc:1078 msgid "Can't read registry key.\n" -msgstr "无法读取注册表键。\n" +msgstr "无法读取注册表项。\n" #: dlls/kernel32/winerror.mc:1083 msgid "Can't write registry key.\n" -msgstr "无法写入注册表键。\n" +msgstr "无法写入注册表项。\n" #: dlls/kernel32/winerror.mc:1088 msgid "Registry has been recovered.\n" @@ -4817,7 +4803,7 @@ msgstr "不是注册表文件。\n" #: dlls/kernel32/winerror.mc:1108 msgid "Key deleted.\n" -msgstr "键已删除。\n" +msgstr "注册表项已删除。\n" #: dlls/kernel32/winerror.mc:1113 msgid "No registry log space.\n" @@ -4825,11 +4811,11 @@ msgstr "注册表日志空间耗尽。\n" #: dlls/kernel32/winerror.mc:1118 msgid "Registry key has subkeys.\n" -msgstr "注册表键包含子键。\n" +msgstr "注册表项包含子项。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子键必须为可变。\n" +msgstr "子项必须为可变。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -6940,10 +6926,8 @@ msgid "Resource is not currently available.\n" msgstr "资源当前不可用。\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "类名：" +msgstr "经典蓝" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -6951,569 +6935,468 @@ msgid "Normal" msgstr "普通" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "盘符" +msgstr "信纸" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "盘符" +msgstr "小号信纸" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "表格(&T)" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "法律专用纸" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "状态" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "执行(&E)..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "小号" +msgstr "小号 A4" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "对开" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "四开" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "记事本" +msgstr "便笺" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "信封 #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "信封 #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "信封 #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "信封 #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "信封 #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C 型纸" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D 型纸" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E 型纸" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "信封 DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "信封 C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "信封 C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "信封 C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "信封 C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "信封 C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "信封 B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "信封 B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "信封 B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "已封装的 PKCS 7" +msgstr "信封" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "信封 Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "已封装的 PKCS 7" +msgstr "6 3/4 信封" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "美国标准复写簿" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "德国标准复写簿" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "德国法律专用复写簿" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "日语" +msgstr "日式明信片" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "邀请信封" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "盘符" +msgstr "特大信纸" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "特大法律专用纸" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "特大 Tabloid" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "其他(&X)" +msgstr "特大 A4" #: dlls/localspl/localspl.rc:88 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "Letter Transverse" -msgstr "横向" +msgstr "信纸横向" #: dlls/localspl/localspl.rc:89 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A4 Transverse" -msgstr "横向" +msgstr "A4 横向" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "特大信纸横向" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "超大 A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "超大 B" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "盘符" +msgstr "加大信纸" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "加大 A4" #: dlls/localspl/localspl.rc:95 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A5 Transverse" -msgstr "横向" +msgstr "A5 横向" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) 横向" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "其他(&X)" +msgstr "特大 A3" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "其他(&X)" +msgstr "特大 A5" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "特大 B5 (ISO)" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A3 Transverse" -msgstr "横向" +msgstr "A3 横向" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "特大 A3 横向" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "日式双层明信片" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "日式信封 Kaku #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "日式信封 Kaku #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "日式信封 Chou #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "日式信封 Chou #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "信纸旋转" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 旋转" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 旋转" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 旋转" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) 旋转" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) 旋转" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "日式明信片旋转" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "日式双层明信片旋转" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 旋转" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "日式信封 Kaku #2 旋转" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "日式信封 Kaku #3 旋转" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "日式信封 Chou #3 旋转" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "日式信封 Chou #4 旋转" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) 旋转" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "日式信纸 You #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "日式信纸 You #4 旋转" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "中国 16 开" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "中国 32 开" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "中国 32 开 (大)" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "中国 16 开旋转" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "中国 32 开旋转" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "中国 32 开 (大) 旋转" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #1 旋转" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #2 旋转" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #3 旋转" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #4 旋转" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #5 旋转" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #6 旋转" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #7 旋转" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #8 旋转" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #9 旋转" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #10 旋转" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7530,7 +7413,7 @@ msgstr "添加本地端口" #: dlls/localui/localui.rc:42 msgid "&Enter the port name to add:" -msgstr "添加本地端口名称(&E)：" +msgstr "添加本地端口名称(&E):" #: dlls/localui/localui.rc:51 msgid "Configure LPT Port" @@ -7542,7 +7425,7 @@ msgstr "超时(秒)" #: dlls/localui/localui.rc:55 msgid "&Transmission Retry:" -msgstr "重试通讯(&T)：" +msgstr "重试通讯(&T):" #: dlls/localui/localui.rc:32 msgid "'%s' is not a valid port name" @@ -7962,7 +7845,7 @@ msgstr "输入网络密码" #: dlls/mpr/mpr.rc:38 dlls/wininet/wininet.rc:51 dlls/wininet/wininet.rc:71 msgid "Please enter your username and password:" -msgstr "请输入用户名和密码：" +msgstr "请输入用户名和密码:" #: dlls/mpr/mpr.rc:39 dlls/wininet/wininet.rc:52 msgid "Proxy" @@ -7994,11 +7877,11 @@ msgstr "保存为(&S)..." #: dlls/msacm32/msacm32.rc:42 msgid "&Format:" -msgstr "格式(&F)：" +msgstr "格式(&F):" #: dlls/msacm32/msacm32.rc:47 msgid "&Attributes:" -msgstr "属性(&A)：" +msgstr "属性(&A):" #: dlls/mshtml/mshtml.rc:39 msgid "Hyperlink" @@ -8010,11 +7893,11 @@ msgstr "超链接信息" #: dlls/mshtml/mshtml.rc:43 programs/winecfg/winecfg.rc:243 msgid "&Type:" -msgstr "类型(&T)：" +msgstr "类型(&T):" #: dlls/mshtml/mshtml.rc:45 msgid "&URL:" -msgstr "网址(&U)：" +msgstr "网址(&U):" #: dlls/mshtml/mshtml.rc:34 msgid "HTML Document" @@ -8076,31 +7959,31 @@ msgid "" msgstr "" "Windows Installer %s\n" "\n" -"用法：\n" +"用法:\n" "msiexec 命令 {必要参数} [可选参数]\n" "\n" -"安装产品：\n" +"安装产品:\n" "\t/i {安装包|产品序列号} [属性]\n" "\t/package {安装包|产品序列号} [属性]\n" "\t/a package [属性]\n" -"修复安装：\n" +"修复安装:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {产品|序列号}\n" -"卸载产品：\n" +"卸载产品:\n" "\t/uninstall {产品|序列号} [属性]\n" "\t/x {产品|序列号} [属性]\n" -"宣传产品：\n" +"宣传产品:\n" "\t/j[u|m] package [/t 变形] [/g 语言代号]\n" "应用补丁\n" "\t/p 补丁包 [属性]\n" "\t/p 补丁包 /a 安装包 [属性]\n" -"以上命令的日志和用户界面修饰：\n" +"以上命令的日志和用户界面修饰:\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] 日志文件\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" -"注册 MSI 服务：\n" +"注册 MSI 服务:\n" "\t/y\n" -"取消注册 MSI 服务：\n" +"取消注册 MSI 服务:\n" "\t/z\n" -"显示此帮助信息：\n" +"显示此帮助信息:\n" "\t/help\n" "\t/?\n" @@ -8118,7 +8001,7 @@ msgstr "本功能的网络驱动器不存在" #: dlls/msi/msi.rc:64 msgid "feature from:" -msgstr "功能来自：" +msgstr "功能来自:" #: dlls/msi/msi.rc:65 msgid "choose which folder contains %s" @@ -8374,87 +8257,87 @@ msgstr "正在写入系统注册表值" #: dlls/msi/msi.rc:161 msgid "Free space: [1]" -msgstr "可用空间： [1]" +msgstr "可用空间: [1]" #: dlls/msi/msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "属性：[1]，签名：[2]" +msgstr "属性: [1]，签名: [2]" #: dlls/msi/msi.rc:163 msgid "File: [1]" -msgstr "文件：[1]" +msgstr "文件: [1]" #: dlls/msi/msi.rc:164 dlls/msi/msi.rc:191 msgid "Folder: [1]" -msgstr "文件夹：[1]" +msgstr "文件夹: [1]" #: dlls/msi/msi.rc:165 dlls/msi/msi.rc:194 msgid "Shortcut: [1]" -msgstr "快捷方式：[1]" +msgstr "快捷方式: [1]" #: dlls/msi/msi.rc:166 dlls/msi/msi.rc:197 dlls/msi/msi.rc:198 msgid "Service: [1]" -msgstr "服务：[1]" +msgstr "服务: [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "文件：[1]，路径：[9]，大小：[6]" +msgstr "文件: [1]，路径: [9]，大小: [6]" #: dlls/msi/msi.rc:168 msgid "Found application: [1]" -msgstr "找到应用程序：[1]" +msgstr "找到应用程序: [1]" #: dlls/msi/msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "文件：[1]，路径：[9]，大小：[6]" +msgstr "文件: [1]，路径: [9]，大小: [6]" #: dlls/msi/msi.rc:171 msgid "Service: [2]" -msgstr "服务：[2]" +msgstr "服务: [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "文件：[1]，依赖项：[2]" +msgstr "文件: [1]，依赖项: [2]" #: dlls/msi/msi.rc:173 msgid "Application: [1]" -msgstr "应用程序：[1]" +msgstr "应用程序: [1]" #: dlls/msi/msi.rc:175 dlls/msi/msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "应用程序上下文：[1]，组装名称：[2]" +msgstr "应用程序上下文: [1]，组装名称: [2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "文件：[1]，路径：[2]，大小：[3]" +msgstr "文件: [1]，路径: [2]，大小: [3]" #: dlls/msi/msi.rc:178 dlls/msi/msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" -msgstr "组件 ID：[1]，修饰符：[2]" +msgstr "组件 ID: [1]，修饰符: [2]" #: dlls/msi/msi.rc:179 dlls/msi/msi.rc:200 msgid "Feature: [1]" -msgstr "特性：[1]" +msgstr "特性: [1]" #: dlls/msi/msi.rc:180 dlls/msi/msi.rc:201 msgid "Class Id: [1]" -msgstr "类 ID：[1]" +msgstr "类 ID: [1]" #: dlls/msi/msi.rc:181 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" +msgstr "应用程序 ID: [1]{{，应用程序类型: [2]，用户: [3]，RSN: [4]}}" #: dlls/msi/msi.rc:182 dlls/msi/msi.rc:203 msgid "Extension: [1]" -msgstr "扩展名：[1]" +msgstr "扩展名: [1]" #: dlls/msi/msi.rc:183 dlls/msi/msi.rc:204 msgid "Font: [1]" -msgstr "字体：[1]" +msgstr "字体: [1]" #: dlls/msi/msi.rc:184 dlls/msi/msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "MIME 内容类型：[1]，扩展名：[2]" +msgstr "MIME 内容类型: [1]，扩展名: [2]" #: dlls/msi/msi.rc:185 dlls/msi/msi.rc:206 msgid "ProgId: [1]" @@ -8466,27 +8349,27 @@ msgstr "LibID: [1]" #: dlls/msi/msi.rc:187 dlls/msi/msi.rc:190 msgid "File: [1], Directory: [9]" -msgstr "文件：[1]，路径：[9]" +msgstr "文件: [1]，路径: [9]" #: dlls/msi/msi.rc:188 dlls/msi/msi.rc:208 msgid "Name: [1], Value: [2], Action [3]" -msgstr "名称：[1]，值：[2]，动作 [3]" +msgstr "名称: [1]，值: [2]，动作 [3]" #: dlls/msi/msi.rc:189 msgid "Application: [1], Command line: [2]" -msgstr "应用程序：[1]，命令行：[2]" +msgstr "应用程序: [1]，命令行: [2]" #: dlls/msi/msi.rc:192 dlls/msi/msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "文件：[1]，板块：[2]，键：[3]，值：［4]" +msgstr "文件: [1]，节: [2]，项: [3]，值:［4]" #: dlls/msi/msi.rc:193 msgid "Key: [1], Name: [2]" -msgstr "键：[1]，名称：[2]" +msgstr "项: [1]，名称: [2]" #: dlls/msi/msi.rc:195 dlls/msi/msi.rc:196 msgid "File: [1], Folder: [2]" -msgstr "文件：[1]，文件夹：[2]" +msgstr "文件: [1]，文件夹: [2]" #: dlls/msi/msi.rc:202 msgid "AppId: [1]{{, AppType: [2]}}" @@ -8494,11 +8377,11 @@ msgstr "AppId: [1]{{, AppType: [2]}}" #: dlls/msi/msi.rc:210 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "键：[1]，名称：[2]，值：[3]" +msgstr "项: [1]，名称: [2]，值: [3]" #: dlls/msi/msi.rc:72 msgid "{{Fatal error: }}" -msgstr "{{致命错误：}}" +msgstr "{{致命错误: }}" #: dlls/msi/msi.rc:73 msgid "{{Error [1]. }}" @@ -8519,41 +8402,41 @@ msgid "" "arguments are: [2], [3], [4]}}" msgstr "" "安装程序在安装此软件包时遇到了未预期的错误。这可能代表软件包存在问题。错误码" -"为 [1]。{{参数为：[2]，[3]，[4]}}" +"为 [1]。{{参数为: [2]，[3]，[4]}}" #: dlls/msi/msi.rc:77 msgid "{{Disk full: }}" -msgstr "{{磁盘已满：}}" +msgstr "{{磁盘已满: }}" #: dlls/msi/msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "操作 [Time]：[1]。[2]" +msgstr "操作 [Time]: [1]。[2]" #: dlls/msi/msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "消息类型：[1]，参数：[2]{, [3]}" +msgstr "消息类型: [1]，参数: [2]{，[3]}" #: dlls/msi/msi.rc:82 msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== 日志开头：[Date] [Time] ===" +msgstr "=== 日志开头: [Date] [Time] ===" #: dlls/msi/msi.rc:80 msgid "Action start [Time]: [1]." -msgstr "操作开始 [Time]：[1]。" +msgstr "操作开始 [Time]: [1]。" #: dlls/msi/msi.rc:81 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "操作结束 [Time]：[1]。返回值 [2]。" +msgstr "操作结束 [Time]: [1]。返回值 [2]。" #: dlls/msi/msi.rc:84 msgid "Please insert the disk: [2]" -msgstr "请插入磁盘：[2]" +msgstr "请插入磁盘: [2]" #: dlls/msi/msi.rc:85 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." -msgstr "找不到源文件{{(cabinet)}}：[2]。请检查文件是否存在且可被您访问。" +msgstr "找不到源文件{{(cabinet)}}: [2]。请检查文件是否存在且可被您访问。" #: dlls/msrle32/msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8573,7 +8456,7 @@ msgstr "视频压缩" #: dlls/msvfw32/msvfw32.rc:39 msgid "&Compressor:" -msgstr "压缩器(&C)：" +msgstr "压缩器(&C):" #: dlls/msvfw32/msvfw32.rc:42 msgid "Con&figure..." @@ -8585,7 +8468,7 @@ msgstr "关于(&A)" #: dlls/msvfw32/msvfw32.rc:47 msgid "Compression &Quality:" -msgstr "压缩质量(&Q)：" +msgstr "压缩质量(&Q):" #: dlls/msvfw32/msvfw32.rc:49 msgid "&Key Frame Every" @@ -9049,7 +8932,7 @@ msgstr "提供者" #: dlls/oledb32/version.rc:59 msgid "Select the data you want to connect to:" -msgstr "选择您想要连接的数据源：" +msgstr "选择您想要连接的数据源:" #: dlls/oledb32/version.rc:66 msgid "Connection" @@ -9057,11 +8940,11 @@ msgstr "连接" #: dlls/oledb32/version.rc:69 msgid "Specify the following to connect to ODBC data:" -msgstr "指定以下内容以连接到 ODBC 数据源：" +msgstr "指定以下内容以连接到 ODBC 数据源:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "1. 指定数据源：" +msgstr "1. 指定数据源:" #: dlls/oledb32/version.rc:71 msgid "Use &data source name" @@ -9073,7 +8956,7 @@ msgstr "使用连接字符串(&O)" #: dlls/oledb32/version.rc:75 msgid "&Connection string:" -msgstr "连接字符串(&C)：" +msgstr "连接字符串(&C):" #: dlls/oledb32/version.rc:77 msgid "B&uild..." @@ -9085,7 +8968,7 @@ msgstr "2. 输入服务器登录信息" #: dlls/oledb32/version.rc:79 msgid "User &name:" -msgstr "用户名(&N)：" +msgstr "用户名(&N):" #: dlls/oledb32/version.rc:83 msgid "&Blank password" @@ -9097,7 +8980,7 @@ msgstr "允许保存密码(&S)" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "3. 输入要使用的初始目录：" +msgstr "3. 输入要使用的初始目录:" #: dlls/oledb32/version.rc:87 msgid "&Test Connection" @@ -9113,15 +8996,15 @@ msgstr "网络设置" #: dlls/oledb32/version.rc:96 msgid "&Impersonation level:" -msgstr "模拟级别(&I)：" +msgstr "模拟级别(&I):" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "保护级别(&R)：" +msgstr "保护级别(&R):" #: dlls/oledb32/version.rc:101 msgid "Connect:" -msgstr "连接：" +msgstr "连接:" #: dlls/oledb32/version.rc:103 msgid "seconds." @@ -9129,7 +9012,7 @@ msgstr "秒。" #: dlls/oledb32/version.rc:104 msgid "A&ccess:" -msgstr "访问(&A)：" +msgstr "访问(&A):" #: dlls/oledb32/version.rc:110 msgid "All" @@ -9203,7 +9086,7 @@ msgstr "插入对象" #: dlls/oledlg/oledlg.rc:61 msgid "Object Type:" -msgstr "对象类型：" +msgstr "对象类型:" #: dlls/oledlg/oledlg.rc:64 dlls/oledlg/oledlg.rc:102 msgid "Result" @@ -9235,7 +9118,7 @@ msgstr "浏览..." #: dlls/oledlg/oledlg.rc:76 msgid "File:" -msgstr "文件：" +msgstr "文件:" #: dlls/oledlg/oledlg.rc:82 msgid "Paste Special" @@ -9243,7 +9126,7 @@ msgstr "特殊粘贴" #: dlls/oledlg/oledlg.rc:85 dlls/setupapi/setupapi.rc:43 msgid "Source:" -msgstr "源文件：" +msgstr "源文件:" #: dlls/oledlg/oledlg.rc:86 dlls/shdoclc/shdoclc.rc:50 #: dlls/shdoclc/shdoclc.rc:82 dlls/shdoclc/shdoclc.rc:95 @@ -9259,7 +9142,7 @@ msgstr "粘贴链接(&L)" #: dlls/oledlg/oledlg.rc:90 msgid "&As:" -msgstr "为(&A)：" +msgstr "为(&A):" #: dlls/oledlg/oledlg.rc:97 msgid "&Display As Icon" @@ -9271,14 +9154,14 @@ msgstr "改变图标(&I)..." #: dlls/oledlg/oledlg.rc:28 msgid "Insert a new %s object into your document" -msgstr "在你的文件中插入一个新的 %s 对象" +msgstr "在您的文件中插入一个新的 %s 对象" #: dlls/oledlg/oledlg.rc:29 msgid "" "Insert the contents of the file as an object into your document so that you " "may activate it using the program which created it." msgstr "" -"将文件的内容以对象的方式插入到你的文件以便你可以用创建本文件的程序来激活它。" +"将文件的内容以对象的方式插入到您的文件以便您可以用创建本文件的程序来激活它。" #: dlls/oledlg/oledlg.rc:30 dlls/shell32/shell32.rc:195 msgid "Browse" @@ -9312,20 +9195,20 @@ msgstr "对象(&O)" #: dlls/oledlg/oledlg.rc:41 msgid "Inserts the contents of the clipboard into your document as %s." -msgstr "将剪贴板的内容以 %s 插入到你的文件。" +msgstr "将剪贴板的内容以 %s 插入到您的文件。" #: dlls/oledlg/oledlg.rc:42 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." -msgstr "将剪贴板的内容插入到你的文件以便你可以使用 %s。" +msgstr "将剪贴板的内容插入到您的文件以便您可以使用 %s。" #: dlls/oledlg/oledlg.rc:43 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." msgstr "" -"将剪贴板的内容插入到你的文件，你可以用 %s 激活它。插入的内容会显示为图标。" +"将剪贴板的内容插入到您的文件，您可以用 %s 激活它。插入的内容会显示为图标。" #: dlls/oledlg/oledlg.rc:44 msgid "" @@ -9333,8 +9216,8 @@ msgid "" "linked to the source file so that changes to the file will be reflected in " "your document." msgstr "" -"将剪贴板的内容以 %s 插入到你的文件。数据是链接到源文件的, 对源文件的任何改动" -"都会反映到反映到你的文档中。" +"将剪贴板的内容以 %s 插入到您的文件。数据是链接到源文件的, 对源文件的任何改动" +"都会反映到反映到您的文档中。" #: dlls/oledlg/oledlg.rc:45 msgid "" @@ -9342,7 +9225,7 @@ msgid "" "is linked to the source file so that changes to the file will be reflected " "in your document." msgstr "" -"插入剪贴板中的图片。图片是链接到源文件的，对源文件的任何改动都会反映到你的文" +"插入剪贴板中的图片。图片是链接到源文件的，对源文件的任何改动都会反映到您的文" "档中。" #: dlls/oledlg/oledlg.rc:46 @@ -9352,11 +9235,11 @@ msgid "" "be reflected in your document." msgstr "" "插入指向剪贴板中文件的快捷方式。快捷方式是链接到源文件的，对源文件的任何改动" -"都会反映到你的文档中。" +"都会反映到您的文档中。" #: dlls/oledlg/oledlg.rc:47 msgid "Inserts the contents of the clipboard into your document." -msgstr "将剪贴板的内容插入到你的文件。" +msgstr "将剪贴板的内容插入到您的文件。" #: dlls/oledlg/oledlg.rc:48 programs/regedit/regedit.rc:430 msgid "Unknown Type" @@ -9434,7 +9317,7 @@ msgstr "复制文件..." #: dlls/setupapi/setupapi.rc:45 msgid "Destination:" -msgstr "目标文件：" +msgstr "目标文件:" #: dlls/setupapi/setupapi.rc:52 msgid "Files Needed" @@ -9448,7 +9331,7 @@ msgstr "插入厂商的安装磁盘，然后确定下面选择了正确的驱动 #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" -msgstr "从此处复制厂商文件：" +msgstr "从此处复制厂商文件:" #: dlls/setupapi/setupapi.rc:31 msgid "The file '%1' on %2 is needed" @@ -9460,7 +9343,7 @@ msgstr "未知" #: dlls/setupapi/setupapi.rc:33 msgid "Copy files from:" -msgstr "文件复制来源：" +msgstr "文件复制来源:" #: dlls/setupapi/setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." @@ -9860,7 +9743,7 @@ msgstr "选择文件夹" #: dlls/shell32/shell32.rc:291 msgid "Folder:" -msgstr "文件夹：" +msgstr "文件夹:" #: dlls/shell32/shell32.rc:297 msgid "&Make New Folder" @@ -9888,7 +9771,7 @@ msgstr "运行于 %s" #: dlls/shell32/shell32.rc:327 msgid "Wine was brought to you by:" -msgstr "Wine 开发人员：" +msgstr "Wine 开发者:" #: dlls/shell32/shell32.rc:332 msgid "Run" @@ -9902,7 +9785,7 @@ msgstr "输入程序，目录，文件或者Internet资源名，Wine将为您打 #: dlls/shell32/shell32.rc:337 msgid "&Open:" -msgstr "打开(&O)：" +msgstr "打开(&O):" #: dlls/shell32/shell32.rc:341 programs/progman/progman.rc:182 #: programs/progman/progman.rc:201 programs/progman/progman.rc:218 @@ -9912,25 +9795,25 @@ msgstr "浏览(&B)..." #: dlls/shell32/shell32.rc:353 dlls/shell32/shell32.rc:382 msgid "File type:" -msgstr "文件类型：" +msgstr "文件类型:" #: dlls/shell32/shell32.rc:357 dlls/shell32/shell32.rc:390 #: dlls/urlmon/urlmon.rc:37 programs/explorer/explorer.rc:33 msgid "Location:" -msgstr "位置：" +msgstr "位置:" #: dlls/shell32/shell32.rc:359 dlls/shell32/shell32.rc:392 #: programs/winefile/winefile.rc:169 msgid "Size:" -msgstr "大小：" +msgstr "大小:" #: dlls/shell32/shell32.rc:363 dlls/shell32/shell32.rc:396 msgid "Creation date:" -msgstr "创建日期：" +msgstr "创建日期:" #: dlls/shell32/shell32.rc:367 dlls/shell32/shell32.rc:404 msgid "Attributes:" -msgstr "属性：" +msgstr "属性:" #: dlls/shell32/shell32.rc:369 dlls/shell32/shell32.rc:406 #: programs/winefile/winefile.rc:173 @@ -9944,7 +9827,7 @@ msgstr "存档(&A)" #: dlls/shell32/shell32.rc:384 msgid "Open with:" -msgstr "打开方式：" +msgstr "打开方式:" #: dlls/shell32/shell32.rc:387 msgid "&Change..." @@ -9952,11 +9835,11 @@ msgstr "更改(&C)..." #: dlls/shell32/shell32.rc:398 msgid "Last modified:" -msgstr "最近修改：" +msgstr "最近修改:" #: dlls/shell32/shell32.rc:400 msgid "Last accessed:" -msgstr "最近访问：" +msgstr "最近访问:" #: dlls/shell32/shell32.rc:138 dlls/shell32/shell32.rc:142 #: programs/winefile/winefile.rc:107 @@ -10154,7 +10037,7 @@ msgstr "下载" #: dlls/shell32/shell32.rc:167 msgid "Unable to create new Folder: Permission denied." -msgstr "无法创建新文件夹：拒绝访问。" +msgstr "无法创建新文件夹: 拒绝访问。" #: dlls/shell32/shell32.rc:168 msgid "Error during creation of a new folder" @@ -10263,7 +10146,7 @@ msgid "" msgstr "" "文件 %1 已经存在。\n" "\n" -"是否替换？" +"您要替换它吗?" #: dlls/shell32/shell32.rc:248 msgid "" @@ -10273,7 +10156,7 @@ msgid "" msgstr "" "文件夹 %1 已经存在。\n" "\n" -"是否替换？" +"您要替换它吗?" #: dlls/shell32/shell32.rc:249 msgid "Confirm overwrite" @@ -10357,7 +10240,7 @@ msgstr "中国夏令时" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) 北京，重庆，香港，乌鲁木齐" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10369,7 +10252,7 @@ msgstr "北亚夏令时" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) 雅茨克" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" @@ -10381,17 +10264,15 @@ msgstr "格鲁吉亚夏令时" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) 第比利斯" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:395 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "协调世界时" +msgstr "(UTC+12:00) 协调世界时+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" @@ -10403,7 +10284,7 @@ msgstr "尼泊尔夏令时" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) 加德满都" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" @@ -10415,7 +10296,7 @@ msgstr "佛得角夏令时" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) 佛得角群岛" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" @@ -10427,7 +10308,7 @@ msgstr "海地夏令时" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) 海地" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" @@ -10439,7 +10320,7 @@ msgstr "中欧夏令时" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) 萨拉热窝，斯科普里，华沙，萨格勒布" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10451,33 +10332,27 @@ msgstr "摩洛哥夏令时" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) 卡萨布兰卡" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:404 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "协调世界时" +msgstr "(UTC-08:00) 协调世界时-8" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "大西洋标准时间" +msgstr "阿尔泰标准时间" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "大西洋夏令时" +msgstr "阿尔泰夏令时" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) 巴尔瑙尔，戈尔诺-阿尔泰斯克" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" @@ -10489,7 +10364,7 @@ msgstr "中欧夏令时" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) 贝尔格莱德，布拉迪斯拉发，布达佩斯，卢布尔雅那，布拉格" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10501,7 +10376,7 @@ msgstr "伊朗夏令时" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) 德黑兰" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" @@ -10512,26 +10387,20 @@ msgid "Saint Pierre Daylight Time" msgstr "圣皮埃尔夏令时" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "圣皮埃尔标准时间" +msgstr "(UTC-03:00) 圣皮埃尔和密克隆" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "萨摩亚标准时间" +msgstr "圣多美标准时间" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "萨摩亚夏令时" +msgstr "圣多美夏令时" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) 圣多美" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" @@ -10543,7 +10412,7 @@ msgstr "纳米比亚夏令时" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) 温得和克" #: dlls/tzres/tzres.rc:369 msgid "Tonga Standard Time" @@ -10555,19 +10424,19 @@ msgstr "汤加夏令时" #: dlls/tzres/tzres.rc:371 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) 努库阿洛法" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" -msgstr "山地标准时间（墨西哥）" +msgstr "山地标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:241 msgid "Mountain Daylight Time (Mexico)" -msgstr "山地夏令时（墨西哥）" +msgstr "山地夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) 奇瓦瓦，拉巴斯，马萨特兰" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" @@ -10579,23 +10448,19 @@ msgstr "格林尼治夏令时" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) 柏林，爱丁堡，里斯本，伦敦" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "South Sudan Standard Time" -msgstr "约旦标准时间" +msgstr "南苏丹标准时间" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "约旦夏令时" +msgstr "南苏丹夏令时" #: dlls/tzres/tzres.rc:344 msgid "(UTC+02:00) Juba" -msgstr "" +msgstr "(UTC+02:00) 朱巴" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -10607,7 +10472,7 @@ msgstr "中亚夏令时" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) 阿斯塔纳" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" @@ -10619,7 +10484,7 @@ msgstr "豪勋爵夏令时" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) 豪勋爵岛" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" @@ -10631,17 +10496,15 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) 巴格达" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:398 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "协调世界时" +msgstr "(UTC+13:00) 协调世界时+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" @@ -10653,7 +10516,7 @@ msgstr "马加丹夏令时" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) 马加丹" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" @@ -10665,23 +10528,19 @@ msgstr "纽芬兰夏令时" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) 纽芬兰" #: dlls/tzres/tzres.rc:348 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "约旦标准时间" +msgstr "苏丹标准时间" #: dlls/tzres/tzres.rc:349 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "约旦夏令时" +msgstr "苏丹夏令时" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) 喀土穆" #: dlls/tzres/tzres.rc:438 msgid "West Pacific Standard Time" @@ -10693,7 +10552,7 @@ msgstr "西太平洋夏令时" #: dlls/tzres/tzres.rc:440 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) 关岛，莫尔兹比港" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10705,7 +10564,7 @@ msgstr "太平洋夏令时" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) 太平洋时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" @@ -10717,7 +10576,7 @@ msgstr "阿塞拜疆夏令时" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) 巴库" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" @@ -10729,7 +10588,7 @@ msgstr "麦哲伦夏令时" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) 蓬塔阿雷纳斯" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" @@ -10741,7 +10600,7 @@ msgstr "萨摩亚夏令时" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) 萨摩亚" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" @@ -10753,19 +10612,19 @@ msgstr "加里宁格勒夏令时" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) 加里宁格勒" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" -msgstr "太平洋标准时间（墨西哥）" +msgstr "太平洋标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:283 msgid "Pacific Daylight Time (Mexico)" -msgstr "太平洋夏令时（墨西哥）" +msgstr "太平洋夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) 下加利福尼亚" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" @@ -10777,7 +10636,7 @@ msgstr "中东夏令时" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) 贝鲁特" #: dlls/tzres/tzres.rc:363 msgid "Tokyo Standard Time" @@ -10789,7 +10648,7 @@ msgstr "东京夏令时" #: dlls/tzres/tzres.rc:365 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) 大阪，札幌，东京" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10801,7 +10660,7 @@ msgstr "莱恩群岛夏令时" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) 圣诞岛" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" @@ -10813,7 +10672,7 @@ msgstr "古巴夏令时" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) 哈瓦拉" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" @@ -10825,7 +10684,7 @@ msgstr "约旦夏令时" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) 安曼" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" @@ -10837,31 +10696,27 @@ msgstr "中部夏令时" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) 中部时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" -msgstr "" +msgstr "俄罗斯时区 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) 伊热夫斯克，萨马拉" #: dlls/tzres/tzres.rc:417 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "汤加标准时间" +msgstr "伏尔加格勒标准时间" #: dlls/tzres/tzres.rc:418 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "汤加夏令时" +msgstr "伏尔加格勒夏令时" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) 伏尔加格勒" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -10873,7 +10728,7 @@ msgstr "亚速尔群岛夏令时" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) 亚速尔群岛" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" @@ -10885,17 +10740,15 @@ msgstr "北亚东部夏令时" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) 伊尔库茨克" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:410 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "协调世界时" +msgstr "(UTC-11:00) 协调世界时-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" @@ -10907,23 +10760,19 @@ msgstr "阿根廷夏令时" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) 布宜诺斯艾利斯市" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "土耳其标准时间" +msgstr "特克斯和凯科斯群岛标准时间" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "土耳其夏令时" +msgstr "特克斯和凯科斯群岛夏令时" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) 特克斯和凯科斯群岛" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -10935,7 +10784,7 @@ msgstr "马克萨斯夏令时" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) 马克萨斯群岛" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" @@ -10947,17 +10796,15 @@ msgstr "缅甸夏令时" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) 仰光" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "Coordinated Universal Time" msgstr "协调世界时" #: dlls/tzres/tzres.rc:392 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "协调世界时" +msgstr "(UTC) 协调世界时" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" @@ -10969,7 +10816,7 @@ msgstr "印度夏令时" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) 马德拉斯，加尔各答，孟买，新德里" #: dlls/tzres/tzres.rc:180 msgid "GTB Standard Time" @@ -10981,7 +10828,7 @@ msgstr "GTB 夏令时" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) 雅典，布加勒斯特" #: dlls/tzres/tzres.rc:375 msgid "Turkey Standard Time" @@ -10993,23 +10840,19 @@ msgstr "土耳其夏令时" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) 伊斯坦布尔" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "阿拉伯标准时间" +msgstr "阿斯特拉罕标准时间" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "阿拉伯夏令时" +msgstr "阿斯特拉罕夏令时" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) 阿斯特拉罕，乌里扬诺夫斯克" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -11021,7 +10864,7 @@ msgstr "斐济夏令时" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) 斐济" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" @@ -11033,23 +10876,19 @@ msgstr "加拿大中部夏令时" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) 萨斯喀彻温省" #: dlls/tzres/tzres.rc:444 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "雅库次克标准时间" +msgstr "育空标准时间" #: dlls/tzres/tzres.rc:445 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "雅库次克夏令时" +msgstr "育空夏令时" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) 育空" #: dlls/tzres/tzres.rc:354 msgid "Taipei Standard Time" @@ -11061,7 +10900,7 @@ msgstr "台北夏令时" #: dlls/tzres/tzres.rc:356 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) 台北" #: dlls/tzres/tzres.rc:426 msgid "W. Europe Standard Time" @@ -11073,7 +10912,7 @@ msgstr "西欧夏令时" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) 阿姆斯特丹，柏林，伯尔尼，罗马，斯德哥尔摩，维也纳" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" @@ -11085,7 +10924,7 @@ msgstr "蒙得维的亚夏令时" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) 蒙得维的亚" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" @@ -11097,23 +10936,19 @@ msgstr "巴基斯坦夏令时" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) 伊斯兰堡，卡拉奇" #: dlls/tzres/tzres.rc:366 -#, fuzzy -#| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "东京标准时间" +msgstr "托木斯克标准时间" #: dlls/tzres/tzres.rc:367 -#, fuzzy -#| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "东京夏令时" +msgstr "托木斯克夏令时" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) 托木斯克" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11125,7 +10960,7 @@ msgstr "高加索夏令时" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) 埃里温" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11137,7 +10972,7 @@ msgstr "澳大利亚东部夏令时" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) 堪培拉，墨尔本，悉尼" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" @@ -11149,7 +10984,7 @@ msgstr "中北亚夏令时" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) 新西伯利亚" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" @@ -11161,67 +10996,55 @@ msgstr "东部夏令时" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) 东部时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:372 -#, fuzzy -#| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "塔斯马尼亚标准时间" +msgstr "外贝加尔标准时间" #: dlls/tzres/tzres.rc:373 -#, fuzzy -#| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "塔斯马尼亚夏令时" +msgstr "外贝加尔夏令时" #: dlls/tzres/tzres.rc:374 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) 赤塔" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "西欧标准时间" +msgstr "东欧标准时间" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "西欧夏令时" +msgstr "东欧夏令时" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) 基希讷乌" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" -msgstr "中部标准时间（墨西哥）" +msgstr "中部标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:121 msgid "Central Daylight Time (Mexico)" -msgstr "中部夏令时（墨西哥）" +msgstr "中部夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) 瓜达拉哈拉，墨西哥城，蒙特雷" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "萨摩亚标准时间" +msgstr "萨拉托夫标准时间" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "萨摩亚夏令时" +msgstr "萨拉托夫夏令时" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) 萨拉托夫" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" @@ -11233,7 +11056,7 @@ msgstr "大西洋夏令时" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) 大西洋时间 (加拿大)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" @@ -11245,7 +11068,7 @@ msgstr "山地夏令时" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) 山地时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:384 msgid "US Eastern Standard Time" @@ -11257,23 +11080,19 @@ msgstr "美国东部夏令时" #: dlls/tzres/tzres.rc:386 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) 印第安那 (东部)" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "阿拉斯加标准时间" +msgstr "萨哈林加标准时间" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "阿拉斯加夏令时" +msgstr "萨哈林夏令时" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) 萨哈林" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" @@ -11285,7 +11104,7 @@ msgstr "朝鲜夏令时" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) 平壤" #: dlls/tzres/tzres.rc:357 msgid "Tasmania Standard Time" @@ -11297,7 +11116,7 @@ msgstr "塔斯马尼亚夏令时" #: dlls/tzres/tzres.rc:359 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) 霍巴特" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" @@ -11309,17 +11128,15 @@ msgstr "中美洲夏令时" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) 中美洲" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:401 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "协调世界时" +msgstr "(UTC-02:00) 协调世界时-02" #: dlls/tzres/tzres.rc:387 msgid "US Mountain Standard Time" @@ -11331,7 +11148,7 @@ msgstr "美国山地夏令时" #: dlls/tzres/tzres.rc:389 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) 亚利桑那" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" @@ -11343,7 +11160,7 @@ msgstr "南非夏令时" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) 哈拉雷，比勒陀利亚" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" @@ -11355,17 +11172,15 @@ msgstr "澳大利亚中部夏令时" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) 阿德莱德" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:407 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "协调世界时" +msgstr "(UTC-09:00) 协调世界时-09" #: dlls/tzres/tzres.rc:345 msgid "Sri Lanka Standard Time" @@ -11377,7 +11192,7 @@ msgstr "斯里兰卡夏令时" #: dlls/tzres/tzres.rc:347 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) 斯里加亚渥登普拉" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" @@ -11389,7 +11204,7 @@ msgstr "阿富汗夏令时" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) 喀布尔" #: dlls/tzres/tzres.rc:441 msgid "Yakutsk Standard Time" @@ -11401,7 +11216,7 @@ msgstr "雅库次克夏令时" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) 雅库茨克" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" @@ -11413,7 +11228,7 @@ msgstr "南美东部夏令时" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) 卡宴，福塔雷萨" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" @@ -11425,7 +11240,7 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) 科威特，利雅得" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" @@ -11437,7 +11252,7 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) 阿布扎比，马斯喀特" #: dlls/tzres/tzres.rc:360 msgid "Tocantins Standard Time" @@ -11449,7 +11264,7 @@ msgstr "托坎廷斯夏令时" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) 阿拉瓜伊纳" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" @@ -11461,7 +11276,7 @@ msgstr "俄罗斯夏令时" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) 莫斯科，圣彼得堡" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" @@ -11473,7 +11288,7 @@ msgstr "澳大利亚中西部夏令时" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) 尤克拉" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" @@ -11485,7 +11300,7 @@ msgstr "罗曼夏令时" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) 布鲁塞尔，哥本哈根，马德里，巴黎" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" @@ -11497,31 +11312,27 @@ msgstr "叶卡捷琳堡夏令时" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) 叶卡特琳堡" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "俄罗斯时区 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) 阿纳德尔，彼得罗巴甫洛夫斯克-堪察加" #: dlls/tzres/tzres.rc:435 -#, fuzzy -#| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "西亚标准时间" +msgstr "西岸标准时间" #: dlls/tzres/tzres.rc:436 -#, fuzzy -#| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "西亚夏令时" +msgstr "西岸夏令时" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) 加沙，希伯仑" #: dlls/tzres/tzres.rc:351 msgid "Syria Standard Time" @@ -11533,7 +11344,7 @@ msgstr "叙利亚夏令时" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) 大马士革" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" @@ -11545,7 +11356,7 @@ msgstr "澳大利亚中部夏令时" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) 达尔文" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" @@ -11557,7 +11368,7 @@ msgstr "格林威治夏令时" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) 蒙罗维亚，雷克雅未克" #: dlls/tzres/tzres.rc:381 msgid "Ulaanbaatar Standard Time" @@ -11569,23 +11380,19 @@ msgstr "乌兰巴托夏令时" #: dlls/tzres/tzres.rc:383 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) 乌兰巴托" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "摩洛哥标准时间" +msgstr "诺福克标准时间" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "摩洛哥夏令时" +msgstr "诺福克夏令时" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) 诺福克" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" @@ -11597,7 +11404,7 @@ msgstr "以色列夏令时" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) 耶路撒冷" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" @@ -11609,7 +11416,7 @@ msgstr "孟加拉夏令时" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) 达卡" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" @@ -11621,7 +11428,7 @@ msgstr "南美太平洋夏令时" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) 波哥大，利马，基多，里奥布朗库" #: dlls/tzres/tzres.rc:432 msgid "West Asia Standard Time" @@ -11633,7 +11440,7 @@ msgstr "西亚夏令时" #: dlls/tzres/tzres.rc:434 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) 阿什哈巴德，塔什干" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" @@ -11645,7 +11452,7 @@ msgstr "阿拉斯加夏令时" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) 阿拉斯加" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" @@ -11657,7 +11464,7 @@ msgstr "巴拉圭夏令时" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) 亚松森" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" @@ -11669,7 +11476,7 @@ msgstr "日期变更线夏令时" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) 国际日期变更线西" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" @@ -11681,7 +11488,7 @@ msgstr "利比亚夏令时" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) 的黎波里" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" @@ -11693,7 +11500,7 @@ msgstr "巴伊亚夏令时" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) 萨尔瓦多" #: dlls/tzres/tzres.rc:411 msgid "Venezuela Standard Time" @@ -11705,7 +11512,7 @@ msgstr "委内瑞拉夏令时" #: dlls/tzres/tzres.rc:413 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) 加拉加斯" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" @@ -11717,7 +11524,7 @@ msgstr "布干维尔夏令时" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) 布干维尔岛" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" @@ -11729,7 +11536,7 @@ msgstr "夏威夷夏令时" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) 夏威夷" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" @@ -11741,39 +11548,31 @@ msgstr "东南亚夏令时" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) 曼谷，河内，雅加达" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "约旦标准时间" +msgstr "克孜洛尔达标准时间" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "约旦夏令时" +msgstr "克孜洛尔达夏令时" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) 克孜洛尔达" #: dlls/tzres/tzres.rc:429 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "汤加标准时间" +msgstr "西蒙古标准时间" #: dlls/tzres/tzres.rc:430 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "汤加夏令时" +msgstr "西蒙古夏令时" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) 科布多" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" @@ -11785,7 +11584,7 @@ msgstr "新西兰夏令时" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) 奥克兰，惠灵顿" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" @@ -11797,23 +11596,19 @@ msgstr "阿留申夏令时" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) 阿留申群岛" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "雅库次克标准时间" +msgstr "鄂木斯克标准时间" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "雅库次克夏令时" +msgstr "鄂木斯克克夏令时" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) 鄂木斯克" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" @@ -11825,7 +11620,7 @@ msgstr "巴西中部夏令时" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) 库亚巴" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" @@ -11837,7 +11632,7 @@ msgstr "白罗斯夏令时" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) 明斯克" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" @@ -11849,7 +11644,7 @@ msgstr "南美西部夏令时" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) 乔治敦，拉巴斯，马瑙斯，圣胡安" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" @@ -11861,7 +11656,7 @@ msgstr "格陵兰夏令时" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) 格陵兰" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" @@ -11873,15 +11668,15 @@ msgstr "复活节岛夏令时" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) 复活节岛" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" -msgstr "" +msgstr "俄罗斯时区 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) 乔库尔达赫" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" @@ -11893,19 +11688,19 @@ msgstr "埃及夏令时" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) 开罗" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" -msgstr "东部标准时间（墨西哥）" +msgstr "东部标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:154 msgid "Eastern Daylight Time (Mexico)" -msgstr "东部夏令时（墨西哥）" +msgstr "东部夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) 切图马尔" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" @@ -11917,19 +11712,19 @@ msgstr "毛里求斯夏令时" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) 路易港" #: dlls/tzres/tzres.rc:414 msgid "Vladivostok Standard Time" -msgstr "符拉迪沃斯托克标准时间" +msgstr "海参崴标准时间" #: dlls/tzres/tzres.rc:415 msgid "Vladivostok Daylight Time" -msgstr "符拉迪沃斯托克夏令时" +msgstr "海参崴夏令时" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) 海参崴" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" @@ -11941,7 +11736,7 @@ msgstr "新加坡夏令时" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) 吉隆坡，新加坡" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" @@ -11953,7 +11748,7 @@ msgstr "韩国夏令时" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) 首尔" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" @@ -11965,7 +11760,7 @@ msgstr "查塔姆夏令时" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) 查塔姆群岛" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" @@ -11977,7 +11772,7 @@ msgstr "东非夏令时" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) 奈洛比" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" @@ -11989,7 +11784,7 @@ msgstr "FLE 夏令时" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) 赫尔辛基，基辅，里加，索菲亚，塔林，维尔纽斯" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" @@ -12001,7 +11796,7 @@ msgstr "东南美洲夏令时" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) 巴西利亚" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" @@ -12013,7 +11808,7 @@ msgstr "中太平洋夏令时" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) 所罗门群岛，新喀里多尼亚" #: dlls/tzres/tzres.rc:423 msgid "W. Central Africa Standard Time" @@ -12025,7 +11820,7 @@ msgstr "西中非夏令时" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) 中非西部" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" @@ -12037,7 +11832,7 @@ msgstr "太平洋南美夏令时" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) 圣地亚哥" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" @@ -12049,7 +11844,7 @@ msgstr "澳大利亚东部夏令时" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) 布里斯班" #: dlls/tzres/tzres.rc:420 msgid "W. Australia Standard Time" @@ -12061,7 +11856,7 @@ msgstr "澳大利亚西部夏令时" #: dlls/tzres/tzres.rc:422 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) 珀斯" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -12069,7 +11864,7 @@ msgstr "安全警告" #: dlls/urlmon/urlmon.rc:35 msgid "Do you want to install this software?" -msgstr "是否安装该软件？" +msgstr "您是否要安装该软件?" #: dlls/urlmon/urlmon.rc:39 msgid "Don't install" @@ -12085,7 +11880,7 @@ msgstr "" #: dlls/urlmon/urlmon.rc:51 msgid "Installation of component failed: %08x" -msgstr "安装组件失败：%08x" +msgstr "安装组件失败: %08x" #: dlls/urlmon/urlmon.rc:52 msgid "Install (%d)" @@ -12314,11 +12109,11 @@ msgstr "前置全部窗口" #: dlls/wineps.drv/wineps.rc:31 msgid "Paper Si&ze:" -msgstr "纸张大小(&Z)：" +msgstr "纸张大小(&Z):" #: dlls/wineps.drv/wineps.rc:39 msgid "Duplex:" -msgstr "双面：" +msgstr "双面:" #: dlls/wineps.drv/wineps.rc:50 msgid "Setup" @@ -12342,7 +12137,7 @@ msgstr "此站点的证书有问题。" #: dlls/wininet/wininet.rc:93 msgid "Do you want to continue anyway?" -msgstr "还是要继续吗？" +msgstr "您无论如何还是要继续吗?" #: dlls/wininet/wininet.rc:28 msgid "LAN Connection" @@ -12439,7 +12234,7 @@ msgstr "从服务器接收的 SSL 证书日期无效。该证书已过期。\n" #: dlls/wininet/winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "SSL 证书一般名称（域名栏目）不正确。\n" +msgstr "SSL 证书公用名 (主机名字段) 不正确。\n" #: dlls/winmm/winmm.rc:32 msgid "The specified command was carried out." @@ -12469,7 +12264,7 @@ msgstr "指定的设备句柄无效。" #: dlls/winmm/winmm.rc:38 msgid "There is no driver installed on your system!" -msgstr "你的系统上没有安装任何驱动程序!" +msgstr "您的系统上没有安装任何驱动程序!" #: dlls/winmm/winmm.rc:39 dlls/winmm/winmm.rc:65 msgid "" @@ -12626,7 +12421,7 @@ msgstr "指定的命令需要一个参数。请提供一个参数。" #: dlls/winmm/winmm.rc:75 msgid "The MCI device you are using does not support the specified command." -msgstr "你正在使用的 MCI 设备不支持指定的命令。" +msgstr "您正在使用的 MCI 设备不支持指定的命令。" #: dlls/winmm/winmm.rc:76 msgid "" @@ -12957,7 +12752,7 @@ msgstr "打印到文件" #: dlls/winspool.drv/winspool.rc:40 msgid "&Output File Name:" -msgstr "输出文件名(&O)：" +msgstr "输出文件名(&O):" #: dlls/winspool.drv/winspool.rc:31 msgid "The output file already exists. Click OK to overwrite." @@ -13217,7 +13012,7 @@ msgstr "" #: programs/attrib/attrib.rc:31 programs/cmd/cmd.rc:376 msgid "%1: File Not Found\n" -msgstr "%1：找不到文件\n" +msgstr "%1: 找不到文件\n" #: programs/attrib/attrib.rc:50 msgid "" @@ -13260,13 +13055,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "当前代码页: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "无效消息。\n" +msgstr "无效代码页\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13279,6 +13072,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [数字]\n" +"\n" +" 设置或显示当前的终端代码页。\n" +"\n" +" 数字要设置的终端代码页。\n" +"\n" +" 仅输入 CHCP 而不输入数字将显示当前使用的终端代码页。\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -13401,7 +13202,7 @@ msgid "" msgstr "" "FOR 用于逐一执行用于一组文件的命令。\n" "\n" -"用法：FOR %变量 IN（命令组）DO 命令\n" +"用法: FOR %变量 IN (命令组) DO 命令\n" "\n" "在批处理文件中使用 FOR 时必须将 % 符号写两次。\n" @@ -13447,9 +13248,9 @@ msgid "" msgstr "" "IF 用于根据条件执行命令。\n" "\n" -"语法：\tIF [NOT] EXIST 文件名命令\n" -"\tIF [NOT] 字符串1==字符串2 命令\n" -"\tIF [NOT] ERRORLEVEL 序号命令\n" +"语法: IF [NOT] EXIST 文件名命令\n" +" IF [NOT] 字符串1==字符串2 命令\n" +" IF [NOT] ERRORLEVEL 序号命令\n" "\n" "在命令的第二种用法中，字符串 1 和字符串 2 必须用双引号包住。比较条件\n" "非大小写敏感。\n" @@ -13464,7 +13265,7 @@ msgid "" msgstr "" "LABEL 用于设置磁盘卷标。\n" "\n" -"语法：LABEL [drive:]\n" +"语法: LABEL [drive:]\n" "该命令将询问指定驱动器的新卷标。\n" "您可以使用 VOL 命令显示磁盘卷标。\n" @@ -13508,7 +13309,7 @@ msgstr "" "输入 PATH 将显示当前的 PATH 设置（默认从注册表读取）。在 PATH 后附加\n" "新值以改变设置。\n" "\n" -"也可以使用 PATH 环境变量来编辑 PATH 值，例如：\n" +"也可以使用 PATH 环境变量来编辑 PATH 值，例如:\n" "PATH %PATH%;c:\\temp\n" #: programs/cmd/cmd.rc:148 @@ -13550,7 +13351,7 @@ msgstr "" "PROMPT 命令后跟随的字符串（包括紧随其后的空格）将在 cmd 等待输入时\n" "在行头显示。\n" "\n" -"如下字符串带有特殊含义，如下：\n" +"如下字符串带有特殊含义，如下:\n" "\n" "$$ 美金符号 $_ 换行 $b 管道符号 (|)\n" "$d 当前日期 $e 转义 $g > 符号\n" @@ -13610,7 +13411,7 @@ msgstr "" "\n" "SET 不带参数使用可用于显示当前所有的环境变量。\n" "\n" -"传教或修改环境变量的语法如下：\n" +"传教或修改环境变量的语法如下:\n" "\n" "SET <变量>=<值>\n" "\n" @@ -13660,11 +13461,11 @@ msgid "" "/? Display this help and exit.\n" msgstr "" "启动程序，或用一般用于带有某个后缀的程序打开文档。\n" -"用法：\n" +"用法:\n" "start [选项] 程序文件名 [...]\n" "start [选项] 文档文件名\n" "\n" -"选项：\n" +"选项:\n" "“标题”\t设置子窗口的标题。\n" "/d 目录\t在指定目录启动程序。\n" "/b\t\t不要为程序创建新控制台。\n" @@ -13711,7 +13512,7 @@ msgid "" "\n" "The verify flag has no function in Wine.\n" msgstr "" -"VERIFY 用于设置、清除或测试校验旗标。有效形式如下：\n" +"VERIFY 用于设置、清除或测试校验旗标。有效形式如下:\n" "\n" "VERIFY ON\t设置此旗标。\n" "VERIFY OFF\t清除此旗标。\n" @@ -13770,7 +13571,7 @@ msgid "" msgstr "" "ASSOC 显示或更改文件扩展名所关联的文件类型。\n" "\n" -"语法：ASSOC [.扩展名[=[文件类型]]]\n" +"语法: ASSOC [.扩展名[=[文件类型]]]\n" "\n" "不带参数运行 ASSOC 将显示当前的文件类型关联。\n" "如使用文件扩展名作为参数，将显示当前扩展名的关联信息。\n" @@ -13791,7 +13592,7 @@ msgid "" msgstr "" "FTYPE 显示或更改与文件类型关联的打开命令。\n" "\n" -"语法：FTYPE [文件类型[=[打开命令]]]\n" +"语法: FTYPE [文件类型[=[打开命令]]]\n" "\n" "如不带任何参数运行，该命令将显示已定义启动命令字符串的文件类型。\n" "如使用文件类型作为参数，该命令将显示关联于此文件类型的启动命令（如果存" @@ -13826,9 +13627,9 @@ msgid "" msgstr "" "创建符号链接。\n" "\n" -"语法：MKLINK [options] link_name target\n" +"语法: MKLINK [options] link_name target\n" "\n" -"选项：\n" +"选项: \n" "/d 创建目录符号链接。\n" "/h 创建硬链接。\n" "/j 创建目录结。\n" @@ -13883,7 +13684,7 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"CMD 的内建命令如下：\n" +"CMD 的内建命令如下:\n" "ASSOC\t\t显示或更改文件扩展名关联\n" "ATTRIB\t\t显示或更改 DOS 文件属性\n" "CALL\t\t在批处理文件中调用另一个批处理文件\n" @@ -13925,7 +13726,7 @@ msgstr "" #: programs/cmd/cmd.rc:365 msgid "Are you sure?" -msgstr "确定吗？" +msgstr "您确定吗?" #: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" @@ -13947,7 +13748,7 @@ msgstr "没有与文件类型 \"%1\" 相关联的打开命令\n" #: programs/cmd/cmd.rc:370 msgid "Overwrite %1?" -msgstr "覆盖 %1？" +msgstr "覆盖 %1?" #: programs/cmd/cmd.rc:371 msgid "More..." @@ -13955,7 +13756,7 @@ msgstr "更多..." #: programs/cmd/cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "批处理中的行可能被截断。正在使用：\n" +msgstr "批处理中的行可能被截断。正在使用:\n" #: programs/cmd/cmd.rc:374 msgid "Argument missing\n" @@ -13983,11 +13784,11 @@ msgstr "当前时间是 %1\n" #: programs/cmd/cmd.rc:381 msgid "Enter new date: " -msgstr "输入新的日期：" +msgstr "输入新的日期: " #: programs/cmd/cmd.rc:382 msgid "Enter new time: " -msgstr "输入新的时间：" +msgstr "输入新的时间: " #: programs/cmd/cmd.rc:383 msgid "Environment variable %1 not defined\n" @@ -14008,7 +13809,7 @@ msgstr "A" #: programs/cmd/cmd.rc:387 msgid "Delete %1?" -msgstr "删除 %1？" +msgstr "删除 %1?" #: programs/cmd/cmd.rc:388 msgid "Echo is %1\n" @@ -14129,7 +13930,7 @@ msgstr "命令历史" #: programs/conhost/conhost.rc:60 msgid "&Buffer size:" -msgstr "缓冲区大小(&B)：" +msgstr "缓冲区大小(&B):" #: programs/conhost/conhost.rc:63 msgid "&Remove duplicates" @@ -14177,11 +13978,11 @@ msgstr "缓冲区" #: programs/conhost/conhost.rc:96 msgid "&Width:" -msgstr "宽度(&W)：" +msgstr "宽度(&W):" #: programs/conhost/conhost.rc:99 msgid "&Height:" -msgstr "高度(&H)：" +msgstr "高度(&H):" #: programs/conhost/conhost.rc:103 msgid "Window size" @@ -14189,11 +13990,11 @@ msgstr "窗口大小" #: programs/conhost/conhost.rc:104 msgid "W&idth:" -msgstr "宽度(&I)：" +msgstr "宽度(&I):" #: programs/conhost/conhost.rc:107 msgid "H&eight:" -msgstr "高度(&E)：" +msgstr "高度(&E):" #: programs/conhost/conhost.rc:111 msgid "End of program" @@ -14313,19 +14114,19 @@ msgstr "" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "语法：fsutil hardlink create <new> <existing>\n" +msgstr "语法: fsutil hardlink create <new> <existing>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" -msgstr "用法：hostname\n" +msgstr "用法: hostname\n" #: programs/hostname/hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "错误：无效的选项 '%c'。\n" +msgstr "错误: 无效的选项 '%c'。\n" #: programs/hostname/hostname.rc:32 msgid "Error: Could not get hostname: %u.\n" -msgstr "错误：无法获取主机名：%u。\n" +msgstr "错误: 无法获取主机名: %u。\n" #: programs/hostname/hostname.rc:33 msgid "" @@ -14335,7 +14136,7 @@ msgstr "错误: 无法使用 hostname 工具设置系统的主机名。\n" #: programs/ipconfig/ipconfig.rc:30 msgid "Usage: ipconfig [ /? | /all ]\n" -msgstr "用法：ipconfig [ /? | /all ]\n" +msgstr "用法: ipconfig [ /? | /all ]\n" #: programs/ipconfig/ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" @@ -14403,7 +14204,7 @@ msgstr "IPv6 地址" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "主 DNS 后缀" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" @@ -14419,7 +14220,7 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"本命令格式为：\n" +"本命令格式为:\n" "\n" "NET 命令 [参数]\n" " -或-\n" @@ -14436,7 +14237,7 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"本命令格式为：\n" +"本命令格式为:\n" "\n" "NET START [服务]\n" "\n" @@ -14451,7 +14252,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"本命令的格式为：\n" +"本命令的格式为:\n" "\n" "NET STOP 服务\n" "\n" @@ -14459,7 +14260,7 @@ msgstr "" #: programs/net/net.rc:33 msgid "Stopping dependent service: %1\n" -msgstr "正在停止依赖的服务： %1\n" +msgstr "正在停止依赖的服务: %1\n" #: programs/net/net.rc:34 msgid "Could not stop service %1\n" @@ -14513,7 +14314,7 @@ msgstr "" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 打开资源：%4!u!\n" +msgstr "%1 %2 %3 打开资源: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -14537,7 +14338,7 @@ msgstr "正在重新连接" #: programs/net/net.rc:43 msgid "The following services are running:\n" -msgstr "下列服务正在运行：\n" +msgstr "下列服务正在运行:\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -14737,11 +14538,11 @@ msgstr "页面设置" #: programs/notepad/notepad.rc:102 msgid "&Header:" -msgstr "页眉(&H)：" +msgstr "页眉(&H):" #: programs/notepad/notepad.rc:104 msgid "&Footer:" -msgstr "页脚(&F)：" +msgstr "页脚(&F):" #: programs/notepad/notepad.rc:107 msgid "Margins (millimeters)" @@ -14749,15 +14550,15 @@ msgstr "边距(毫米)" #: programs/notepad/notepad.rc:108 msgid "&Left:" -msgstr "左(&L)：" +msgstr "左(&L):" #: programs/notepad/notepad.rc:110 msgid "&Top:" -msgstr "上(&T)：" +msgstr "上(&T):" #: programs/notepad/notepad.rc:126 msgid "Encoding:" -msgstr "编码：" +msgstr "编码:" #: programs/notepad/notepad.rc:132 programs/wordpad/wordpad.rc:289 msgctxt "accelerator Select All" @@ -14831,7 +14632,7 @@ msgstr "错误" #: programs/notepad/notepad.rc:74 msgid "Untitled" -msgstr "（未命名）" +msgstr "(未命名)" #: programs/notepad/notepad.rc:77 programs/winedbg/winedbg.rc:42 msgid "Text files (*.txt)" @@ -14845,7 +14646,7 @@ msgid "" msgstr "" "文件“%s”不存在。\n" "\n" -"您想新建一个文件吗？" +"您想新建一个文件吗?" #: programs/notepad/notepad.rc:82 msgid "" @@ -14855,7 +14656,7 @@ msgid "" msgstr "" "文件“%s”已更改。\n" "\n" -"是否保存更改？" +"您要保存更改吗?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." @@ -14885,7 +14686,7 @@ msgstr "" "%1\n" "此文件包含 Unicode 字符。如果用 %2 编码保存，这些字符将会丢失。\n" "要保留这些字符，请点“取消”，然后选择一种 Unicode 编码。\n" -"要继续吗？" +"要继续吗?" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..." @@ -14990,7 +14791,7 @@ msgstr "连接到另外一台计算机" #: programs/oleview/oleview.rc:159 msgid "&Machine name:" -msgstr "计算机名称(&M)：" +msgstr "计算机名称(&M):" #: programs/oleview/oleview.rc:167 msgid "System Configuration" @@ -15038,7 +14839,7 @@ msgstr "IPersist 接口查看器" #: programs/oleview/oleview.rc:196 programs/oleview/oleview.rc:208 msgid "Class Name:" -msgstr "类名：" +msgstr "类名:" #: programs/oleview/oleview.rc:198 programs/oleview/oleview.rc:210 msgid "CLSID:" @@ -15305,15 +15106,15 @@ msgstr "移动程序" #: programs/progman/progman.rc:118 msgid "Move program:" -msgstr "移动程序：" +msgstr "移动程序:" #: programs/progman/progman.rc:120 programs/progman/progman.rc:138 msgid "From group:" -msgstr "从此程序组中：" +msgstr "从此程序组中:" #: programs/progman/progman.rc:122 programs/progman/progman.rc:140 msgid "&To group:" -msgstr "移动到程序组(&T)：" +msgstr "移动到程序组(&T):" #: programs/progman/progman.rc:134 msgid "Copy Program" @@ -15321,7 +15122,7 @@ msgstr "复制程序" #: programs/progman/progman.rc:136 msgid "Copy program:" -msgstr "复制程序：" +msgstr "复制程序:" #: programs/progman/progman.rc:152 msgid "Program Group Attributes" @@ -15329,7 +15130,7 @@ msgstr "程序组属性" #: programs/progman/progman.rc:156 msgid "&Group file:" -msgstr "组文件(&G)：" +msgstr "组文件(&G):" #: programs/progman/progman.rc:168 msgid "Program Attributes" @@ -15337,15 +15138,15 @@ msgstr "程序属性" #: programs/progman/progman.rc:172 programs/progman/progman.rc:212 msgid "&Command line:" -msgstr "命令行(&C)：" +msgstr "命令行(&C):" #: programs/progman/progman.rc:174 msgid "&Working directory:" -msgstr "工作目录(&W)：" +msgstr "工作目录(&W):" #: programs/progman/progman.rc:176 msgid "&Key combination:" -msgstr "快捷键(&K)：" +msgstr "快捷键(&K):" #: programs/progman/progman.rc:179 programs/progman/progman.rc:215 msgid "&Minimize at launch" @@ -15361,11 +15162,11 @@ msgstr "修改图标" #: programs/progman/progman.rc:194 msgid "&Filename:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: programs/progman/progman.rc:196 msgid "Current &icon:" -msgstr "当前图标(&I)：" +msgstr "当前图标(&I):" #: programs/progman/progman.rc:210 msgid "Execute Program" @@ -15385,11 +15186,11 @@ msgstr "信息" #: programs/progman/progman.rc:68 msgid "Delete group `%s'?" -msgstr "是否删除程序组 “%s”？" +msgstr "是否删除程序组“%s”?" #: programs/progman/progman.rc:69 msgid "Delete program `%s'?" -msgstr "是否删除程序组 “%s”?" +msgstr "是否删除程序组“%s”?" #: programs/progman/progman.rc:70 msgid "Not implemented" @@ -15408,8 +15209,8 @@ msgid "" "The group file `%s' cannot be opened.\n" "Should it be tried further on?" msgstr "" -"不能打开组文件 “%s” 。\n" -"是否继续尝试？" +"不能打开组文件“%s”。\n" +"是否继续尝试?" #: programs/progman/progman.rc:77 msgid "Help not available." @@ -15448,37 +15249,24 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "输入“REG %1 /?”以获取帮助。\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 无法访问或新建所指定的注册表项\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "操作完成\n" +msgstr "reg: 操作成功完成\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "注册表操作已经取消\n" +msgstr "reg: 注册表操作已被取消\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 找不到所指定的注册表项\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 找不到所指定的注册表值\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15489,17 +15277,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "输入“REG /?”以获取帮助。\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -15511,13 +15288,13 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" -"用法：\n" +"用法:\n" " REG [操作] [参数]\n" "\n" -"支持的操作：\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +"支持的操作:\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" -"要获取指定操作的帮助，请输入：\n" +"要获取指定操作的帮助，请输入:\n" " REG [操作] /?\n" "\n" @@ -15686,6 +15463,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <文件>\n" +"\n" +" 从所指定的文件导入注册表项、值或数据到注册表。\n" +"\n" +" <文件>\n" +" 要导入的注册表文件的名称或路径。\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -15731,40 +15515,40 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" 以 32 位视角访问注册表。\n" +"\n" +" /reg:64\n" +" 以 64 位视角访问注册表。\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: 无效的键名\n" +msgstr "reg: 无效的注册表项\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg: 无法访问远程设备\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "regedit: 无效的系统键 [%1]\n" +msgstr "reg: 无效的系统项\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: 无效的选项 [%1]。" #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的十六进制值\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的数字值\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的十六进制值\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的十六进制值\n" #: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的字符串\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的字符串\n" #: programs/reg/reg.rc:124 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" @@ -15784,33 +15568,29 @@ msgstr "reg: 无效的命令行参数\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: 源注册表项和目标项不能相同\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "文件 '%1' 已存在。您想要覆盖它吗?" +msgstr "值“%1\\%2”已经存在于目标项中。您真的要覆盖它吗?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "您真的要删除注册表键值 '%1' 吗?" +msgstr "您真的要删除注册表值“%1”吗?" #: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "您真的要删除 '%1' 下的所有注册表键值吗?" +msgstr "您真的要删除“%1”下的所有注册表值吗?" #: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "您真的要删除注册表键 '%1' 吗?" +msgstr "您真的要删除注册表项“%1”吗?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit：无法删除注册表键“%1”。\n" +msgstr "reg: 无法删除“%1”下所有的注册表值\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -15821,10 +15601,8 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: 无法识别的转义序列 [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: 无法打开注册表键 '%1'。\n" +msgstr "reg: 无法导入注册表项“%1”\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -15853,7 +15631,7 @@ msgstr "导出注册表文件(&E)..." #: programs/regedit/regedit.rc:47 programs/regedit/regedit.rc:99 #: programs/regedit/regedit.rc:121 msgid "&Key" -msgstr "键(&K)" +msgstr "项(&K)" #: programs/regedit/regedit.rc:49 programs/regedit/regedit.rc:101 #: programs/regedit/regedit.rc:123 @@ -15887,7 +15665,7 @@ msgstr "改名(&R)\tF2" #: programs/regedit/regedit.rc:59 programs/regedit/regedit.rc:114 msgid "&Copy Key Name" -msgstr "复制键名(&C)" +msgstr "复制项名(&C)" #: programs/regedit/regedit.rc:61 programs/regedit/regedit.rc:107 #: programs/wordpad/wordpad.rc:53 @@ -15929,19 +15707,19 @@ msgstr "导出注册表" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" -msgstr "指定分支(&E)：" +msgstr "指定分支(&E):" #: programs/regedit/regedit.rc:278 msgid "Find:" -msgstr "查找：" +msgstr "查找:" #: programs/regedit/regedit.rc:280 msgid "Find in:" -msgstr "查找范围：" +msgstr "查找范围:" #: programs/regedit/regedit.rc:281 msgid "Keys" -msgstr "键" +msgstr "项" #: programs/regedit/regedit.rc:282 msgid "Value names" @@ -15961,7 +15739,7 @@ msgstr "添加收藏" #: programs/regedit/regedit.rc:294 programs/regedit/regedit.rc:305 msgid "Name:" -msgstr "名称：" +msgstr "名称:" #: programs/regedit/regedit.rc:302 msgid "Remove Favorite" @@ -15974,12 +15752,12 @@ msgstr "编辑字符串" #: programs/regedit/regedit.rc:316 programs/regedit/regedit.rc:329 #: programs/regedit/regedit.rc:345 programs/regedit/regedit.rc:358 msgid "Value name:" -msgstr "值名称：" +msgstr "值名称:" #: programs/regedit/regedit.rc:318 programs/regedit/regedit.rc:331 #: programs/regedit/regedit.rc:347 programs/regedit/regedit.rc:360 msgid "Value data:" -msgstr "值数据：" +msgstr "值数据:" #: programs/regedit/regedit.rc:326 msgid "Edit DWORD" @@ -16007,19 +15785,19 @@ msgstr "编辑多个字符串" #: programs/regedit/regedit.rc:159 msgid "Contains commands for working with the whole registry" -msgstr "操作整个注册表的命令" +msgstr "包含用于操作整个注册表的命令" #: programs/regedit/regedit.rc:160 msgid "Contains commands for editing values or keys" -msgstr "编辑键和值的命令" +msgstr "包含用于编辑项或值的命令" #: programs/regedit/regedit.rc:161 msgid "Contains commands for customizing the registry window" -msgstr "操作窗口显示的命令" +msgstr "包含用于自定义注册表窗口的命令" #: programs/regedit/regedit.rc:162 msgid "Contains commands for accessing frequently used keys" -msgstr "用于记录常用键的全部命令" +msgstr "包含用于访问常用项的命令" #: programs/regedit/regedit.rc:163 msgid "" @@ -16028,7 +15806,7 @@ msgstr "包含用于显示注册表编辑器帮助及相关信息的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" -msgstr "创建新键或值的命令" +msgstr "包含用于新建项或值的命令" #: programs/regedit/regedit.rc:149 msgid "Data" @@ -16068,7 +15846,7 @@ msgstr "无法修改所选注册表值。" #: programs/regedit/regedit.rc:248 msgid "Unable to create a new registry key." -msgstr "无法创建新注册表键。" +msgstr "无法创建新注册表项。" #: programs/regedit/regedit.rc:249 msgid "Unable to create a new registry value." @@ -16079,8 +15857,8 @@ msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" -"无法重命名键 '%1'。\n" -"该键名已存在。" +"无法重命名项“%1”。\n" +"该项名已存在。" #: programs/regedit/regedit.rc:251 msgid "" @@ -16092,20 +15870,20 @@ msgstr "" #: programs/regedit/regedit.rc:252 msgid "Unable to delete the selected registry key." -msgstr "无法删除所选注册表键。" +msgstr "无法删除所选的注册表项。" #: programs/regedit/regedit.rc:253 msgid "Unable to rename the selected registry key." -msgstr "无法重命名所选注册表键。" +msgstr "无法重命名所选的注册表项。" #: programs/regedit/regedit.rc:254 msgid "Unable to rename the selected registry value." -msgstr "无法重命名所选注册表值。" +msgstr "无法重命名所选的注册表项。" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "%1 所包含的键和值已被成功添加到注册表中。" +msgstr "%1 所包含的项和值已被成功添加到注册表中。" #: programs/regedit/regedit.rc:256 msgid "Unable to import %1. The specified file is not a valid registry file." @@ -16141,34 +15919,34 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" msgstr "" -"用法：\n" -" regedit [选项] [文件名] [注册表键]\n" +"用法:\n" +" regedit [选项] [文件名] [注册表项]\n" "\n" -"选项：\n" -" [无选项]\t\t启动该程序的图形界面。\n" -" /L:system.dat\t要修改的 system.dat 文件的位置。\n" -"\t\t\t与其他任意开关兼容。该选项将被忽略。\n" -" /R:user.dat\t\t要修改的 user.dat 文件的位置。\n" -"\t\t\t与其他任意开关兼容。该选项将被忽略。\n" -" /C\t\t\t导入注册表文件的内容。\n" -" /D\t\t\t删除指定的注册表键。\n" -" /E\t\t\t将指定注册表键的内容导出到文件。\n" -"\t\t\t如未指定任何键，将导出整份注册表。\n" -" /S\t\t\t静默模式。不显示任何消息。\n" -" /V\t\t\t使用高级模式启动图形界面。该选项将被忽略。\n" -" /?\t\t\t显示此信息并退出。\n" -" [文件名]\t\t要导入的注册表信息文件的位置。和 [/E] 一同使用时，\n" -"\t\t\t该选项将转而指定用于导出注册表信息的文件的位置。\n" -" [注册表键]\t\t要更改的注册表键。\n" +"选项:\n" +" [无选项] 启动该程序的图形界面。\n" +" /L:system.dat 要修改的 system.dat 文件的位置。\n" +" 与其他任意开关兼容。该选项将被忽略。\n" +" /R:user.dat 要修改的 user.dat 文件的位置。\n" +" 与其他任意开关兼容。该选项将被忽略。\n" +" /C 导入注册表文件的内容。\n" +" /D 删除指定的注册表项。\n" +" /E 将指定注册表项的内容导出到文件。\n" +" 如未指定任何项，将导出整份注册表。\n" +" /S 静默模式。不显示任何消息。\n" +" /V 使用高级模式启动图形界面。该选项将被忽略。\n" +" /? 显示此信息并退出。\n" +" [文件名] 要导入的注册表信息文件的位置。和 [/E] 一同使用时，\n" +" 该选项将转而指定用于导出注册表信息的文件的位置。" +" [注册表项] 要更改的注册表项。\n" "\n" -"用例：\n" +"用例:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit：无效或无法识别的开关 [%1]\n" +msgstr "regedit: 无效或无法识别的开关 [%1]\n" #: programs/regedit/regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -16180,7 +15958,7 @@ msgstr "regedit: 没有指定文件名。\n" #: programs/regedit/regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "regedit：未指定任何要移除的注册表键。\n" +msgstr "regedit: 未指定任何要移除的注册表项。\n" #: programs/regedit/regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" @@ -16230,7 +16008,7 @@ msgstr "regedit: 无法向 '%2' 添加注册表值 '%1'。\n" #: programs/regedit/regedit.rc:424 msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: 无法打开注册表键 '%1'。\n" +msgstr "regedit: 无法打开注册表项“%1”。\n" #: programs/regedit/regedit.rc:425 msgid "" @@ -16243,16 +16021,16 @@ msgstr "regedit: 注册表值 \"%1\" 将会被导出为二进制数据。\n" #: programs/regedit/regedit.rc:427 msgid "regedit: Invalid system key [%1]\n" -msgstr "regedit: 无效的键名 [%1]\n" +msgstr "regedit: 无效的项名 [%1]\n" #: programs/regedit/regedit.rc:428 msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "regedit: 无法导出 '%1'。未找到指定的注册表键。\n" +msgstr "regedit: 无法导出“%1”。未找到指定的注册表项。\n" #: programs/regedit/regedit.rc:429 msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit：无法删除注册表键“%1”。\n" +msgstr "regedit: 无法删除注册表项“%1”。\n" #: programs/regedit/regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -16264,11 +16042,11 @@ msgstr "退出注册表编辑器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" -msgstr "把键添加到收藏夹" +msgstr "把项添加到收藏夹列表中" #: programs/regedit/regedit.rc:189 msgid "Removes keys from the favorites list" -msgstr "从收藏夹中删除键" +msgstr "从收藏夹列表中删除项" #: programs/regedit/regedit.rc:190 msgid "Shows or hides the status bar" @@ -16292,11 +16070,11 @@ msgstr "选定项更名" #: programs/regedit/regedit.rc:195 msgid "Copies the name of the selected key to the clipboard" -msgstr "把键的名称复制到剪贴板" +msgstr "把所选项的名称复制到剪贴板" #: programs/regedit/regedit.rc:196 msgid "Finds a text string in a key, value or data" -msgstr "在键、值或数据中找字符串" +msgstr "在项、值或数据中查找字符串" #: programs/regedit/regedit.rc:197 msgid "Finds next occurrence of text specified in previous search" @@ -16308,7 +16086,7 @@ msgstr "修改值的数据" #: programs/regedit/regedit.rc:171 msgid "Adds a new key" -msgstr "添加新键" +msgstr "添加新项" #: programs/regedit/regedit.rc:172 msgid "Adds a new string value" @@ -16348,7 +16126,7 @@ msgstr "无法打开注册表值 '%1'。" #: programs/regedit/regedit.rc:207 msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "无法编辑该类型的键 (%1!u!)。" +msgstr "无法编辑该类型的项 (%1!u!)。" #: programs/regedit/regedit.rc:208 msgid "The value is too big (%1!u!)." @@ -16360,7 +16138,7 @@ msgstr "确认删除值" #: programs/regedit/regedit.rc:210 msgid "Are you sure you want to delete the selected registry value?" -msgstr "您真的要删除选中的注册表键值吗?" +msgstr "您真的要删除选中的注册表值吗?" #: programs/regedit/regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -16372,7 +16150,7 @@ msgstr "您确认要删除这些值吗?" #: programs/regedit/regedit.rc:214 msgid "New Key #%d" -msgstr "新键 #%d" +msgstr "新项 #%d" #: programs/regedit/regedit.rc:215 msgid "New Value #%d" @@ -16380,7 +16158,7 @@ msgstr "新值 #%d" #: programs/regedit/regedit.rc:205 msgid "Unable to query the registry key '%1'." -msgstr "无法打开注册表键 '%1'。" +msgstr "无法打开注册表项“%1”。" #: programs/regedit/regedit.rc:170 msgid "Modifies the value's data in binary form" @@ -16400,12 +16178,12 @@ msgstr "添加新可扩展字串值" #: programs/regedit/regedit.rc:212 msgid "Confirm Key Delete" -msgstr "确认删除键" +msgstr "确认删除项" #: programs/regedit/regedit.rc:213 msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "您真的要删除该注册表键及其包含的所有子键吗?" +msgstr "您真的要删除该注册表项及其包含的所有子项吗?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" @@ -16498,37 +16276,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: 成功卸载 DLL \"%1\"\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16559,30 +16306,31 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"启动程序，或用一般用于带有某个后缀的程序打开文档。\n" -"用法：\n" +"用于运行程序，或根据文档的后缀，使用一般用于打开此类文档的程序打开文档。\n" +"用法:\n" "start [选项] 程序文件名 [...]\n" "start [选项] 文档文件名\n" "\n" -"选项：\n" -"“标题”\t设置子窗口的标题。\n" -"/d 目录\t在指定目录启动程序。\n" -"/b\t\t不要为程序创建新控制台。\n" -"/i\t\t使用新环境启动程序。\n" -"/min\t\t最小化启动程序。\n" -"/max\t\t最大化启动程序。\n" -"/low\t\t使用 idle 优先级类启动程序。\n" -"/normal\t\t使用 normal 优先级类启动程序。\n" -"/high\t\t使用 high 优先级类启动程序。\n" -"/realtime\t使用 realtime 优先级类启动程序。\n" -"/abovenormal\t使用 abovenormal 优先级类启动程序。\n" -"/belownormal\t使用 belownormal 优先级类启动程序。\n" -"/n\t\t在指定 NUMA 节点启动程序。\n" -"/affinity 掩码\t使用指定关联性掩码启动程序。\n" -"/wait\t\t等待启动了的程序完成操作后使用其退出代码退出。\n" -"/unix\t\t使用 Unix 文件名并像 Windows 资源管理器一样启动文件。\n" -"/ProgIDOpen\t使用指定 progID 打开文档。\n" -"/?\t\t显示此帮助并退出。\n" +"选项:\n" +"\"标题\" 指定子窗口的标题。\n" +"/d 目录在指定的目录中运行程序。\n" +"/b 不要为程序新建终端。\n" +"/i 使用新的环境变量运行程序。\n" +"/min 以最小化模式运行程序。\n" +"/max 以最大化模式运行程序。\n" +"/low 以 idle 优先级运行程序。\n" +"/normal 以 normal 优先级运行程序。\n" +"/high 以 high 优先级运行程序。\n" +"/realtime 以 realtime 优先级运行程序。\n" +"/abovenormal 以 abovenormal 优先级运行程序。\n" +"/belownormal 以 belownormal 优先级运行程序。\n" +"/node n 在指定的 NUMA 节点中运行程序。\n" +"/affinity 掩码以指定的关联掩码运行程序。\n" +"/wait 等待运行的程序结束，并以它的返回值退出。\n" +"/unix 使用 Unix 文件名并像 Windows 文件管理器一样打开该文件。\n" +"/exec 执行所指定的文件 (在 Wine 内部使用)。\n" +"/ProgIDOpen 以所指定的 progID 打开文档。\n" +"/? 显示此帮助并退出。\n" #: programs/start/start.rc:59 msgid "" @@ -16599,27 +16347,27 @@ msgstr "无法将指定 Unix 文件名转换为 DOS 文件名。" #: programs/taskkill/taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -msgstr "用法：taskkill [/?] [/f] [/im 进程名 | /pid 进程ID]\n" +msgstr "用法: taskkill [/?] [/f] [/im 进程名 | /pid 进程ID]\n" #: programs/taskkill/taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "错误：指定的命令行选项未知或无效。\n" +msgstr "错误: 指定的命令行选项未知或无效。\n" #: programs/taskkill/taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "错误：指定的命令行参数未知或无效。\n" +msgstr "错误: 指定的命令行参数未知或无效。\n" #: programs/taskkill/taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" -msgstr "错误：必须指定 /im 或 /pid 选项。\n" +msgstr "错误: 必须指定 /im 或 /pid 选项。\n" #: programs/taskkill/taskkill.rc:34 msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "错误：选项 %1 需要命令行参数值。\n" +msgstr "错误: 选项 %1 需要命令行参数值。\n" #: programs/taskkill/taskkill.rc:35 msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "错误：选项 /im 和 /pid 不能共存。\n" +msgstr "错误: 选项 /im 和 /pid 不能共存。\n" #: programs/taskkill/taskkill.rc:36 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" @@ -16640,19 +16388,19 @@ msgstr "已经强行结束 PID 为 %2!u! 的进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:40 msgid "Error: Could not find process \"%1\".\n" -msgstr "错误：找不到进程 \"%1\"。\n" +msgstr "错误: 找不到进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:41 msgid "Error: Unable to enumerate the process list.\n" -msgstr "错误：无法列举进程清单。\n" +msgstr "错误: 无法列举进程清单。\n" #: programs/taskkill/taskkill.rc:42 msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "错误：无法结束进程 \"%1\"。\n" +msgstr "错误: 无法结束进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:43 msgid "Error: Process self-termination is not permitted.\n" -msgstr "错误：不允许结束本进程。\n" +msgstr "错误: 不允许结束本进程。\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -17386,8 +17134,8 @@ msgid "" "cause undesired results including system instability. Are you\n" "sure you want to change the priority class?" msgstr "" -"警告：改变此进程优先级可能导致意料之外的后果，例如系统不稳定。\n" -"您确定要改变优先权吗？" +"警告: 改变此进程优先级可能导致意料之外的后果，例如系统不稳定。\n" +"您确定要改变优先权吗?" #: programs/taskmgr/taskmgr.rc:305 msgid "Unable to Change Priority" @@ -17401,8 +17149,8 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"警告：结束此进程可能会导致意料之外的后果，例如数据丢失或者系统不稳定。此\n" -"进程可能在被结束之前来不及保存它的状态和数据。您确定要结束这个进程吗？" +"警告: 结束此进程可能会导致意料之外的后果，例如数据丢失或者系统不稳定。此\n" +"进程可能在被结束之前来不及保存它的状态和数据。您确定要结束这个进程吗?" #: programs/taskmgr/taskmgr.rc:311 msgid "Unable to Terminate Process" @@ -17413,8 +17161,8 @@ msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"警告：调试此进程可能会导致数据丢失。\n" -"您确定要连接调试器吗？" +"警告: 调试此进程可能会导致数据丢失。\n" +"您确定要连接调试器吗?" #: programs/taskmgr/taskmgr.rc:314 msgid "Unable to Debug Process" @@ -17459,7 +17207,7 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "卸载命令 '%s' 运行失败，可能是找不到可执行程序。\n" -"您想把这项卸载条目从注册表中删除吗？" +"您想把这项卸载条目从注册表中删除吗?" #: programs/uninstaller/uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" @@ -17499,10 +17247,10 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" -"用法：\n" +"用法:\n" " uninstaller [选项]\n" "\n" -"选项：\n" +"选项:\n" "\n" " --help\t 显示本信息。\n" " --list\t 列出安装在本 Wine prefix 中的所有应用程序。\n" @@ -17566,7 +17314,7 @@ msgid "" "option) any later version." msgstr "" "本程序为自由软件，您可以遵照自由软件基金会出版的 GNU 较宽松通用公共许可证协议" -"（LGPL）来对其进行添加、修改和重新发布。许可协议版本为2.1，您也可以选择采用更" +"(LGPL) 来对其进行添加、修改和重新发布。许可协议版本为 2.1，您也可以选择采用更" "新的版本。" #: programs/winecfg/winecfg.rc:142 @@ -17575,11 +17323,11 @@ msgstr "Windows 注册信息" #: programs/winecfg/winecfg.rc:143 msgid "&Owner:" -msgstr "姓名(&O)：" +msgstr "姓名(&O):" #: programs/winecfg/winecfg.rc:145 msgid "Organi&zation:" -msgstr "组织(&Z)：" +msgstr "组织(&Z):" #: programs/winecfg/winecfg.rc:153 msgid "Application settings" @@ -17604,7 +17352,7 @@ msgstr "删除程序设置(&R)" #: programs/winecfg/winecfg.rc:160 msgid "&Windows Version:" -msgstr "&Windows 版本：" +msgstr "&Windows 版本:" #: programs/winecfg/winecfg.rc:168 msgid "Window settings" @@ -17628,7 +17376,7 @@ msgstr "虚拟桌面(&D)" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" -msgstr "桌面大小(&S)：" +msgstr "桌面大小(&S):" #: programs/winecfg/winecfg.rc:179 msgid "Screen resolution" @@ -17653,7 +17401,7 @@ msgstr "" #: programs/winecfg/winecfg.rc:193 msgid "&New override for library:" -msgstr "新增函数库顶替(&N)：" +msgstr "新增函数库顶替(&N):" #: programs/winecfg/winecfg.rc:195 msgid "A&dd" @@ -17661,7 +17409,7 @@ msgstr "添加(&D)" #: programs/winecfg/winecfg.rc:196 msgid "Existing &overrides:" -msgstr "已有的函数库顶替(&O)：" +msgstr "已有的函数库顶替(&O):" #: programs/winecfg/winecfg.rc:198 msgid "&Edit..." @@ -17711,7 +17459,7 @@ msgstr "添加(&D)..." #: programs/winecfg/winecfg.rc:239 msgid "&Path:" -msgstr "路径(&P)：" +msgstr "路径(&P):" #: programs/winecfg/winecfg.rc:246 programs/winecfg/winecfg.rc:37 msgid "Show Advan&ced" @@ -17719,7 +17467,7 @@ msgstr "显示高级选项(&C)" #: programs/winecfg/winecfg.rc:247 msgid "De&vice:" -msgstr "设备(&V)：" +msgstr "设备(&V):" #: programs/winecfg/winecfg.rc:249 msgid "Bro&wse..." @@ -17727,11 +17475,11 @@ msgstr "浏览(&W)..." #: programs/winecfg/winecfg.rc:251 msgid "&Label:" -msgstr "卷标(&L)：" +msgstr "卷标(&L):" #: programs/winecfg/winecfg.rc:253 msgid "S&erial:" -msgstr "序列号(&E)：" +msgstr "序列号(&E):" #: programs/winecfg/winecfg.rc:256 msgid "&Show dot files" @@ -17747,19 +17495,19 @@ msgstr "默认值" #: programs/winecfg/winecfg.rc:266 msgid "Output device:" -msgstr "输出设备：" +msgstr "输出设备:" #: programs/winecfg/winecfg.rc:267 msgid "Voice output device:" -msgstr "语音输出设备：" +msgstr "语音输出设备:" #: programs/winecfg/winecfg.rc:268 msgid "Input device:" -msgstr "输入设备：" +msgstr "输入设备:" #: programs/winecfg/winecfg.rc:269 msgid "Voice input device:" -msgstr "语音输入设备：" +msgstr "语音输入设备:" #: programs/winecfg/winecfg.rc:274 msgid "&Test Sound" @@ -17771,7 +17519,7 @@ msgstr "扬声器设置" #: programs/winecfg/winecfg.rc:278 msgid "Speakers:" -msgstr "扬声器：" +msgstr "扬声器:" #: programs/winecfg/winecfg.rc:286 msgid "Appearance" @@ -17779,7 +17527,7 @@ msgstr "外观" #: programs/winecfg/winecfg.rc:287 msgid "&Theme:" -msgstr "主题(&T)：" +msgstr "主题(&T):" #: programs/winecfg/winecfg.rc:289 msgid "&Install theme..." @@ -17787,11 +17535,11 @@ msgstr "安装主题(&I)..." #: programs/winecfg/winecfg.rc:294 msgid "It&em:" -msgstr "物件(&E)：" +msgstr "物件(&E):" #: programs/winecfg/winecfg.rc:296 msgid "C&olor:" -msgstr "颜色(&O)：" +msgstr "颜色(&O):" #: programs/winecfg/winecfg.rc:302 msgid "MIME types" @@ -17807,7 +17555,7 @@ msgstr "文件夹" #: programs/winecfg/winecfg.rc:309 msgid "&Link to:" -msgstr "映射至(&L)：" +msgstr "映射至(&L):" #: programs/winecfg/winecfg.rc:33 msgid "Libraries" @@ -17827,7 +17575,7 @@ msgstr "隐藏高级选项(&C)" #: programs/winecfg/winecfg.rc:38 msgid "(No Theme)" -msgstr "（无主题）" +msgstr "(无主题)" #: programs/winecfg/winecfg.rc:39 msgid "Graphics" @@ -17867,11 +17615,11 @@ msgstr "映射至" #: programs/winecfg/winecfg.rc:44 msgid "Wine configuration for %s" -msgstr "Wine 设置：针对 %s" +msgstr "针对 %s 的 Wine 设置" #: programs/winecfg/winecfg.rc:83 msgid "Selected driver: %s" -msgstr "选中的驱动：%s" +msgstr "选中的驱动: %s" #: programs/winecfg/winecfg.rc:84 msgid "(None)" @@ -17879,7 +17627,7 @@ msgstr "(无)" #: programs/winecfg/winecfg.rc:85 msgid "Audio test failed!" -msgstr "音频测试失败！" +msgstr "音频测试失败!" #: programs/winecfg/winecfg.rc:87 msgid "(System default)" @@ -17907,11 +17655,11 @@ msgid "" "Are you sure you want to do this?" msgstr "" "不建议对这个函数库更改载入顺序。\n" -"你确定要如此吗？" +"您确定要如此吗?" #: programs/winecfg/winecfg.rc:54 msgid "Warning: system library" -msgstr "警告：系统函数库" +msgstr "警告: 系统函数库" #: programs/winecfg/winecfg.rc:55 msgid "native" @@ -17990,10 +17738,10 @@ msgid "" "Most Windows applications expect drive C to exist, and will die messily if " "it doesn't. If you proceed, remember to recreate it!" msgstr "" -"你确定要删除 C 盘吗？\n" +"您确定要删除 C 盘吗?\n" "\n" "大部分 Windows 程序都假定 C 盘存在，如找不到 C 盘可能会导致严重错误。如果要继" -"续，请重新建立此盘！" +"续，请重新建立此盘!" #: programs/winecfg/winecfg.rc:76 msgctxt "Drive letter" @@ -18010,9 +17758,9 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"你没有 C 盘。这可不是件好事。\n" +"您没有 C 盘。这可不是件好事。\n" "\n" -"请记得点选“驱动器”标签的“添加”来建立它！\n" +"请记得点选“驱动器”标签的“添加”来建立它!\n" #: programs/winecfg/winecfg.rc:98 msgid "Controls Background" @@ -18162,7 +17910,7 @@ msgid "" "may want to check the <a href=\"https://appdb.winehq.org\">Application " "Database</a> for tips about running this application." msgstr "" -"这可能是由程序的问题或者 Wine 的缺陷造成的。你可能需要查看 <a href=\"https://" +"这可能是由程序的问题或者 Wine 的缺陷造成的。您可能需要查看 <a href=\"https://" "appdb.winehq.org\">Application Databa</a> 来获取运行该应用的相关技巧。" #: programs/winedbg/winedbg.rc:62 @@ -18192,7 +17940,7 @@ msgstr "您系统中的一个程序崩溃了，但是 WineDbg 无法挂载到进 #: programs/winedbg/winedbg.rc:41 msgid "(unidentified)" -msgstr "（未被识别的）" +msgstr "(未被识别的)" #: programs/winedbg/winedbg.rc:44 msgid "Saving failed" @@ -18316,19 +18064,19 @@ msgstr "显示隐藏文件/系统文件(&S)" #: programs/winefile/winefile.rc:159 msgid "&File Name:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: programs/winefile/winefile.rc:161 msgid "Full &Path:" -msgstr "完整路径(&P)：" +msgstr "完整路径(&P):" #: programs/winefile/winefile.rc:163 msgid "Last Change:" -msgstr "最后更改：" +msgstr "最后更改:" #: programs/winefile/winefile.rc:167 msgid "Cop&yright:" -msgstr "版权(&Y)：" +msgstr "版权(&Y):" #: programs/winefile/winefile.rc:175 msgid "&System" @@ -18449,11 +18197,11 @@ msgstr "重置结果" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" -msgstr "祝贺！" +msgstr "祝贺!" #: programs/winemine/winemine.rc:82 msgid "Please enter your name" -msgstr "请输入你的名字" +msgstr "请输入您的名字" #: programs/winemine/winemine.rc:90 msgid "Custom Game" @@ -18473,7 +18221,7 @@ msgstr "地雷" #: programs/winemine/winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "所有结果都将丢失。您确定吗？" +msgstr "所有结果都将丢失。您确定吗?" #: programs/winemine/winemine.rc:30 msgid "WineMine" @@ -18565,7 +18313,7 @@ msgstr "帮助文件 (*.hlp)" #: programs/winhlp32/winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "找不到文件“%s”。你想要自己找这个文件吗？" +msgstr "找不到文件“%s”。您想要自己找这个文件吗?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" @@ -18573,23 +18321,23 @@ msgstr "找不到 richedit 的实现……终止" #: programs/winhlp32/winhlp32.rc:94 msgid "Help topics: " -msgstr "帮助主题：" +msgstr "帮助主题: " #: programs/wmic/wmic.rc:28 msgid "Error: Command line not supported\n" -msgstr "错误：不支持此命令行\n" +msgstr "错误: 不支持此命令行\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "错误：找不到该别名\n" +msgstr "错误: 找不到该别名\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "错误：无效查询\n" +msgstr "错误: 无效查询\n" #: programs/wmic/wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "错误：PATH 语法无效\n" +msgstr "错误: PATH 语法无效\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -18927,7 +18675,7 @@ msgstr "文档" #: programs/wordpad/wordpad.rc:192 msgid "Save changes to '%s'?" -msgstr "要保存“%s”吗？" +msgstr "要保存“%s”吗?" #: programs/wordpad/wordpad.rc:193 msgid "Finished searching the document." @@ -18941,7 +18689,7 @@ msgstr "RichEdit 装载失败。" msgid "" "You have chosen to save in plain text format, which will cause all " "formatting to be lost. Are you sure that you wish to do this?" -msgstr "你已经选择保存为文本文件，而这可能导致格式丢失。你确定要这么做吗？" +msgstr "您已经选择保存为文本文件，而这可能导致格式丢失。您确定要这么做吗?" #: programs/wordpad/wordpad.rc:198 msgid "Invalid number format." @@ -18957,7 +18705,7 @@ msgstr "不能保存文件。" #: programs/wordpad/wordpad.rc:201 msgid "You do not have access to save the file." -msgstr "你没有保存文件的权限。" +msgstr "您没有保存文件的权限。" #: programs/wordpad/wordpad.rc:202 msgid "Could not open the file." @@ -18965,7 +18713,7 @@ msgstr "不能打开文件。" #: programs/wordpad/wordpad.rc:203 msgid "You do not have access to open the file." -msgstr "你没有打开文件的权限。" +msgstr "您没有打开文件的权限。" #: programs/wordpad/wordpad.rc:204 msgid "Printing not implemented." @@ -19006,16 +18754,16 @@ msgid "" "(F - File, D - Directory)\n" msgstr "" "%1 是一个在目标路径上的\n" -"文件名还是目录？\n" +"文件名还是目录?\n" "(F - 文件，D - 目录)\n" #: programs/xcopy/xcopy.rc:38 msgid "%1? (Yes|No)\n" -msgstr "%1？(是(Y)|否(N))\n" +msgstr "%1? (是(Y)|否(N))\n" #: programs/xcopy/xcopy.rc:39 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "是否覆盖 %1？(是(Y)|否(N)|全部(A))\n" +msgstr "是否覆盖 %1? (是(Y)|否(N)|全部(A))\n" #: programs/xcopy/xcopy.rc:40 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" @@ -19073,11 +18821,11 @@ msgid "" msgstr "" "XCOPY - 将源文件或目录拷贝到目标位置。\n" "\n" -"语法：\n" +"语法:\n" "XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] [/R] [/H]\n" "\t [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n" "\n" -"说明：\n" +"说明:\n" "[/I] 如果目标位置不存在，并且操作会拷贝两个或更多的文件，就假设目标\n" "\t是目录。\n" "[/S] 拷贝目录和子目录。\n" -- 2.34.1

1 0

[PATCH 1/2] user32: Clear validate flag if both internal paint and update now are present.
by Roman Pišl 02 Jan '22

02 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48761 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/user32/painting.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 41c0bb3c6e1..48e84c0d28d 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1239,6 +1239,9 @@ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) /* process pending expose events before painting */ if (flags & RDW_UPDATENOW) USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_PAINT, 0 ); + if ((flags & (RDW_INTERNALPAINT | RDW_UPDATENOW | RDW_VALIDATE)) == (RDW_INTERNALPAINT | RDW_UPDATENOW | RDW_VALIDATE)) + flags &= ~RDW_VALIDATE; + if (rect && !hrgn) { if (IsRectEmpty( rect )) rect = ∅ -- 2.30.2

2 2

[PATCH 1/2] po: update French translation
by Eric Pouech 02 Jan '22

02 Jan '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- po/fr.po | 1131 +++++++++++++++----------------------------------------------- 1 file changed, 273 insertions(+), 858 deletions(-) diff --git a/po/fr.po b/po/fr.po index faba83d9609..79710bc6859 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-10-20 16:19+0100\n" -"Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" +"PO-Revision-Date: 2022-01-02 11:32+0100\n" +"Last-Translator: Eric Pouech <eric.pouech(a)gmail.com>\n" "Language-Team: French\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -19,26 +19,20 @@ msgid "Security" msgstr "Sécurité" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Nom d'utilisateur :" +msgstr "&Noms de groupe ou d'utilisateur :" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Jaune" +msgstr "Autoriser" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Interdire" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permissions for %1" -msgstr "Accès refusé.\n" +msgstr "Permissions pour %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -390,25 +384,23 @@ msgstr "Annulation..." #: dlls/browseui/browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 restante(s)" #: dlls/browseui/browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 et %3!u! %4 restante(s)" #: dlls/browseui/browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Secondes" +msgstr "secondes" #: dlls/browseui/browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minutes" #: dlls/browseui/browseui.rc:33 msgid "hours" -msgstr "" +msgstr "heures" #: dlls/comctl32/comctl32.rc:68 programs/winefile/winefile.rc:156 msgid "Properties for %s" @@ -523,16 +515,12 @@ msgid "&Retry" msgstr "Ré&péter" #: dlls/comctl32/comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "Cacher les &onglets" +msgstr "Cacher les détails" #: dlls/comctl32/comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Détails" +msgstr "Void les détails" #: dlls/comctl32/comctl32.rc:31 dlls/cryptui/cryptui.rc:235 #: programs/regedit/regedit.rc:286 programs/taskmgr/taskmgr.rc:434 @@ -732,15 +720,15 @@ msgstr "Couleurs" #: dlls/comdlg32/comdlg32.rc:286 msgid "&Basic Colors:" -msgstr "Couleurs de base :" +msgstr "Couleurs de &base :" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "Couleurs personnalisées :" +msgstr "&Couleurs personnalisées :" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|S&olide" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" @@ -1430,7 +1418,7 @@ msgstr "Identifiant de clé du sujet" #: dlls/crypt32/crypt32.rc:39 msgid "CRL Reason Code" -msgstr "Code de raison pour la LRC" +msgstr "" #: dlls/crypt32/crypt32.rc:40 msgid "CRL Distribution Points" @@ -2606,16 +2594,12 @@ msgstr "" "Vous avez terminé avec succès l'assistant d'exportation de certificats." #: dlls/cryptui/cryptui.rc:456 dlls/cryptui/cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Sélectionnez le magasin de certificats" +msgstr "Sélectionnez le certificat" #: dlls/cryptui/cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Sélectionnez le magasin de certificats à utiliser :" +msgstr "Sélectionnez le certificats à utiliser" #: dlls/cryptui/cryptui.rc:30 dlls/cryptui/cryptui.rc:93 msgid "Certificate" @@ -3151,20 +3135,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Note : la clé privée de ce certificat n'est pas exportable." #: dlls/cryptui/cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Rôle prévu :" +msgstr "Utilisation prévue :" #: dlls/cryptui/cryptui.rc:178 dlls/shell32/shell32.rc:150 msgid "Location" msgstr "Emplacement" #: dlls/cryptui/cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Sélectionnez le magasin de certificats" +msgstr "Sélectionnez un certificat" #: dlls/cryptui/cryptui.rc:181 programs/winefile/winefile.rc:101 #: programs/winhlp32/winhlp32.rc:110 programs/winhlp32/winhlp32.rc:85 @@ -3676,46 +3656,36 @@ msgid "Publishers..." msgstr "Éditeurs..." #: dlls/inetcpl.cpl/inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Connexion réseau local (LAN)" +msgstr "Connexions" #: dlls/inetcpl.cpl/inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Configuration de Wine" +msgstr "Configuration automatique" #: dlls/inetcpl.cpl/inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Utiliser Web Proxy Auto-Config (WPAD)" #: dlls/inetcpl.cpl/inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Utiliser un script Proxy Auto-Config (PAC)" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adresse" +msgstr "Adresse: " #: dlls/inetcpl.cpl/inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "Serveur &local" +msgstr "Serveur &mandataire" #: dlls/inetcpl.cpl/inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "Utiliser un serveur mandataire" #: dlls/inetcpl.cpl/inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Aucun port" +msgstr "Port: " #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3763,30 +3733,24 @@ msgid "&Disable" msgstr "&Désactiver" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Réinitialiser" +msgstr "&Réinitialiser" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "&Activer" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Éditer le remplacement" +msgstr "&Remplacement" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Connecté" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Périphérique d'entrée voix :" +msgstr "Connecté (périphérique xinput)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3831,7 +3795,7 @@ msgstr "Contrôleurs de jeu" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Tester et configurer les manettes de jeu." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3846,10 +3810,8 @@ msgid "Subscript out of range" msgstr "Indice hors limites" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Plus de papier ; " +msgstr "Dépassement de capacité de pile ; " #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3937,17 +3899,15 @@ msgstr "« @ » attendu" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Erreur de compilation Microsoft JScript" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" msgstr "" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Erreur inconnue" +msgstr "Erreur d'exécution inconnue" #: dlls/jscript/jscript.rc:55 msgid "Number expected" @@ -3990,16 +3950,12 @@ msgid "JScript object expected" msgstr "Objet JScript attendu" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "Objet tableau attendu" +msgstr "Objet énumérateur attendu" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Objet booléen attendu" +msgstr "Objet expression rationnelle attendu" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -4052,10 +4008,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "« [objet] » n'est pas un objet de type date" +msgstr "« this » n'est pas un objet de type Map" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -7038,40 +6992,28 @@ msgid "Connection reset by peer.\n" msgstr "Connexion fermée par le pair.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Non implémenté" +msgstr "Non implémenté.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "Échec de l'appel RPC.\n" +msgstr "Échec de l'appel.\n" #: dlls/kernel32/winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "Message 0x%1 introuvable dans le fichier %2.\n" +msgstr "Pas de signature trouvée dans le fichier.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Niveau non valide.\n" +msgstr "Appel non valide.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Help not available." msgid "Resource is not currently available.\n" -msgstr "Impossible d'afficher l'aide." +msgstr "La ressource n'est pas actuellement disponible.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Nom de classe :" +msgstr "Bleu Classique" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -7079,9 +7021,6 @@ msgid "Normal" msgstr "Normale" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" msgstr "Lettre" @@ -7093,18 +7032,16 @@ msgid "Letter Small" msgstr "Lettre" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "&table" +msgstr "Tabloïde" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: dlls/localspl/localspl.rc:42 #, fuzzy @@ -7113,24 +7050,16 @@ msgid "Statement" msgstr "État" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "E&xécuter..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "T" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "T" +msgstr "A4" #: dlls/localspl/localspl.rc:46 #, fuzzy @@ -7139,35 +7068,32 @@ msgid "A4 Small" msgstr "Petite" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "T" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 #, fuzzy @@ -7177,7 +7103,7 @@ msgstr "Bloc-notes" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "Enveloppe #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" @@ -7273,7 +7199,7 @@ msgstr "" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 #, fuzzy @@ -7283,15 +7209,15 @@ msgstr "Japonais" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" @@ -7371,14 +7297,11 @@ msgstr "&Avancé" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) Extra" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "T" +msgstr "A2" #: dlls/localspl/localspl.rc:101 msgid "A3 Transverse" @@ -7393,11 +7316,8 @@ msgid "Japanese Double Postcard" msgstr "" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "T" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" @@ -7469,7 +7389,7 @@ msgstr "" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" @@ -7477,7 +7397,7 @@ msgstr "" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" @@ -7704,28 +7624,20 @@ msgid "Media Foundation platform is not initialized.\n" msgstr "Plate-forme d'installation non prise en charge.\n" #: dlls/mferror/mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "Nombre d'octets trop petit.\n" +msgstr "La mémoire tampon est trop petite.\n" #: dlls/mferror/mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "Syntaxe de requête invalide.\n" +msgstr "Requête invalide.\n" #: dlls/mferror/mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "Numéro de segment invalide.\n" +msgstr "Numéro de flux non invalide.\n" #: dlls/mferror/mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "Type de donnée invalide.\n" +msgstr "Type de média invalide.\n" #: dlls/mferror/mferror.mc:67 #, fuzzy @@ -7734,44 +7646,32 @@ msgid "No more input is accepted.\n" msgstr "Il n'y a plus d'entrées.\n" #: dlls/mferror/mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "UUID d'objet introuvable.\n" +msgstr "L'objet n'est pas été initialisé.\n" #: dlls/mferror/mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "Opération pas prise en charge.\n" +msgstr "Représentation non prise en charge.\n" #: dlls/mferror/mferror.mc:88 msgid "No more types in the list of suggested media types.\n" msgstr "" #: dlls/mferror/mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "Type non pris en charge.\n" +msgstr "Service non pris en charge.\n" #: dlls/mferror/mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Erreur réseau inattendue.\n" +msgstr "Erreur inattendue.\n" #: dlls/mferror/mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "Heure non valide.\n" +msgstr "Type non valide.\n" #: dlls/mferror/mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "Format de pixel invalide.\n" +msgstr "Format de fichier non valide.\n" #: dlls/mferror/mferror.mc:137 #, fuzzy @@ -7846,16 +7746,12 @@ msgid "Rate change was preempted.\n" msgstr "" #: dlls/mferror/mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "UUID d'objet introuvable.\n" +msgstr "L'objet ou la valeur n'a pas été trouvée.\n" #: dlls/mferror/mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "Impossible d'afficher l'aide." +msgstr "La valeur n'est pas disponible.\n" #: dlls/mferror/mferror.mc:242 #, fuzzy @@ -7922,40 +7818,28 @@ msgid "Unsupported caption.\n" msgstr "Type non pris en charge.\n" #: dlls/mferror/mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "Station de travail non autorisée.\n" +msgstr "Position non valide.\n" #: dlls/mferror/mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "Fichier introuvable.\n" +msgstr "L'attribut n'a pas été trouvé.\n" #: dlls/mferror/mferror.mc:347 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property type is not allowed.\n" -msgstr "Type de point d'entrée non autorisé.\n" +msgstr "Type de propriété non autorisé.\n" #: dlls/mferror/mferror.mc:354 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Property type is not supported.\n" -msgstr "Opération pas prise en charge.\n" +msgstr "Type de propriété pas pris en charge.\n" #: dlls/mferror/mferror.mc:361 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is empty.\n" -msgstr "Le répertoire n'est pas vide.\n" +msgstr "Le propriété est vide.\n" #: dlls/mferror/mferror.mc:368 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is not empty.\n" -msgstr "Le répertoire n'est pas vide.\n" +msgstr "La propriété n'est pas vide.\n" #: dlls/mferror/mferror.mc:375 #, fuzzy @@ -7968,10 +7852,8 @@ msgid "Vector property is required.\n" msgstr "" #: dlls/mferror/mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "Opération annulée par l'utilisateur.\n" +msgstr "L'opération a été annulée.\n" #: dlls/mferror/mferror.mc:396 #, fuzzy @@ -8407,16 +8289,12 @@ msgid "New Folder" msgstr "Nouveau dossier" #: dlls/msi/msi.rc:91 -#, fuzzy -#| msgid "No registry log space.\n" msgid "Allocating registry space" -msgstr "Pas assez d'espace disponible pour le journal du registre.\n" +msgstr "Allocation d'espace pour le registre." #: dlls/msi/msi.rc:92 -#, fuzzy -#| msgid "Single-instance application.\n" msgid "Searching for installed applications" -msgstr "Une seule instance de l'application est autorisée.\n" +msgstr "Recherche d'applications installées" #: dlls/msi/msi.rc:93 msgid "Binding executables" @@ -8430,59 +8308,43 @@ msgstr "Recherche de %s" #: dlls/msi/msi.rc:95 dlls/msi/msi.rc:96 dlls/msi/msi.rc:101 msgid "Computing space requirements" -msgstr "" +msgstr "Calcul de l'espace nécessaire en cours" #: dlls/msi/msi.rc:97 -#, fuzzy -#| msgid "Target folder" msgid "Creating folders" -msgstr "Dossier cible" +msgstr "Création des répertoires" #: dlls/msi/msi.rc:98 -#, fuzzy -#| msgid "Create Shor&tcut" msgid "Creating shortcuts" -msgstr "Créer un &raccourci" +msgstr "Création des raccourcis" #: dlls/msi/msi.rc:99 -#, fuzzy -#| msgid "Exception in service.\n" msgid "Deleting services" -msgstr "Exception durant l'exécution du service.\n" +msgstr "Effacement des services" #: dlls/msi/msi.rc:100 -#, fuzzy -#| msgid "Creation date" msgid "Creating duplicate files" -msgstr "Création" +msgstr "Création de doublons de fichiers" #: dlls/msi/msi.rc:102 -#, fuzzy -#| msgid "No associated application.\n" msgid "Searching for related applications" -msgstr "Aucun application associée.\n" +msgstr "Recherche d'applications associées" #: dlls/msi/msi.rc:103 msgid "Copying network install files" msgstr "" #: dlls/msi/msi.rc:104 -#, fuzzy -#| msgid "Copying Files..." msgid "Copying new files" -msgstr "Copie de fichiers..." +msgstr "Copie des nouveaux fichiers" #: dlls/msi/msi.rc:105 -#, fuzzy -#| msgid "Installation of component failed: %08x" msgid "Installing ODBC components" -msgstr "Échec de l'installation du composant : %08x" +msgstr "Installation des composants ODBC" #: dlls/msi/msi.rc:106 -#, fuzzy -#| msgid "Installer service failed.\n" msgid "Installing new services" -msgstr "Échec du service d'installation.\n" +msgstr "Installation des nouveaux services" #: dlls/msi/msi.rc:107 #, fuzzy @@ -8491,10 +8353,8 @@ msgid "Installing system catalog" msgstr "Installation/Désinstallation" #: dlls/msi/msi.rc:108 -#, fuzzy -#| msgid "Wine Application Uninstaller" msgid "Validating install" -msgstr "Programme de désinstallation des applications Wine" +msgstr "Validation de l'opération d'installation" #: dlls/msi/msi.rc:109 msgid "Evaluating launch conditions" @@ -8505,26 +8365,20 @@ msgid "Migrating feature states from related applications" msgstr "" #: dlls/msi/msi.rc:111 -#, fuzzy -#| msgid "Icon files" msgid "Moving files" -msgstr "Fichiers icônes" +msgstr "Déplacement de Fichiers" #: dlls/msi/msi.rc:112 -#, fuzzy -#| msgid "Version information" msgid "Publishing assembly information" -msgstr "Informations de version" +msgstr "Publication des informations d'assemblage" #: dlls/msi/msi.rc:113 msgid "Unpublishing assembly information" msgstr "" #: dlls/msi/msi.rc:114 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Fichiers icônes" +msgstr "Mise à jour des fichiers" #: dlls/msi/msi.rc:115 msgid "Updating component registration" @@ -8539,10 +8393,8 @@ msgid "Publishing Product Features" msgstr "" #: dlls/msi/msi.rc:118 -#, fuzzy -#| msgid "Client Information" msgid "Publishing product information" -msgstr "Informations sur le client" +msgstr "Publication des information du produit" #: dlls/msi/msi.rc:119 msgid "Registering Class servers" @@ -8558,79 +8410,59 @@ msgstr "" #: dlls/msi/msi.rc:122 msgid "Registering fonts" -msgstr "" +msgstr "Enregistrement des polices de caractères" #: dlls/msi/msi.rc:123 -#, fuzzy -#| msgid "Registry Editor" msgid "Registering MIME info" -msgstr "Éditeur du registre" +msgstr "Enregistrement d'information MIME" #: dlls/msi/msi.rc:124 -#, fuzzy -#| msgid "Registry is corrupt.\n" msgid "Registering product" -msgstr "Le registre est corrompu.\n" +msgstr "Enregistrement du produit" #: dlls/msi/msi.rc:125 msgid "Registering program identifiers" msgstr "" #: dlls/msi/msi.rc:126 -#, fuzzy -#| msgid "Type Libraries" msgid "Registering type libraries" -msgstr "Bibliothèques de types" +msgstr "Enregistrement des bibliothèques de types" #: dlls/msi/msi.rc:127 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Registering user" -msgstr "Ressource en cours d'utilisation.\n" +msgstr "Enregistrement de l'utilisateur" #: dlls/msi/msi.rc:128 -#, fuzzy -#| msgid "&Remove duplicates" msgid "Removing duplicated files" -msgstr "&Supprimer les doublons" +msgstr "Suppression des fichiers en doublon" #: dlls/msi/msi.rc:129 dlls/msi/msi.rc:153 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "Application des réglages des polices" +msgstr "Mise à jour des variables d'environnement" #: dlls/msi/msi.rc:130 -#, fuzzy -#| msgid "&Remove application" msgid "Removing applications" -msgstr "&Supprimer une application" +msgstr "Suppression des applications" #: dlls/msi/msi.rc:131 -#, fuzzy -#| msgid "Icon files" msgid "Removing files" -msgstr "Fichiers icônes" +msgstr "Suppression des fichiers" #: dlls/msi/msi.rc:132 msgid "Removing folders" -msgstr "" +msgstr "Suppression des répertoires" #: dlls/msi/msi.rc:133 msgid "Removing INI files entries" msgstr "" #: dlls/msi/msi.rc:134 -#, fuzzy -#| msgid "Domain Component" msgid "Removing ODBC components" -msgstr "Composant de domaine" +msgstr "Suppression des composants ODBC" #: dlls/msi/msi.rc:135 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Removing system registry values" -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Suppression des valeurs dans le regitre système" #: dlls/msi/msi.rc:136 msgid "Removing shortcuts" @@ -8645,22 +8477,16 @@ msgid "Unregistering modules" msgstr "" #: dlls/msi/msi.rc:140 -#, fuzzy -#| msgid "Initializing; " msgid "Initializing ODBC directories" -msgstr "Démarrage en cours ; " +msgstr "Initialisation des répertoires ODBC" #: dlls/msi/msi.rc:141 -#, fuzzy -#| msgid "Starting Wordpad failed" msgid "Starting services" -msgstr "Wordpad n'a pas pu être démarré" +msgstr "Démarrage des services" #: dlls/msi/msi.rc:142 -#, fuzzy -#| msgid "Stopping dependent service: %1\n" msgid "Stopping services" -msgstr "Arrêt du service dépendant : %1\n" +msgstr "Arrêt des services" #: dlls/msi/msi.rc:143 msgid "Unpublishing Qualified Components" @@ -8668,13 +8494,11 @@ msgstr "" #: dlls/msi/msi.rc:144 msgid "Unpublishing Product Features" -msgstr "" +msgstr "Dépublication des caractéristiques du produit" #: dlls/msi/msi.rc:145 -#, fuzzy -#| msgid "Client Information" msgid "Unpublishing product information" -msgstr "Informations sur le client" +msgstr "Dépublication des informations du produit" #: dlls/msi/msi.rc:146 msgid "Unregister Class servers" @@ -8709,18 +8533,16 @@ msgid "Writing INI files values" msgstr "" #: dlls/msi/msi.rc:155 -#, fuzzy -#| msgid "Warning: system library" msgid "Writing system registry values" -msgstr "Attention : bibliothèque système" +msgstr "Écriture des valeurs dans le registre système" #: dlls/msi/msi.rc:161 msgid "Free space: [1]" -msgstr "" +msgstr "Espace disponible : [1]" #: dlls/msi/msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Propriété : [1], signature : [2]" #: dlls/msi/msi.rc:163 msgid "File: [1]" @@ -8732,43 +8554,35 @@ msgstr "Dossier : [1]" #: dlls/msi/msi.rc:165 dlls/msi/msi.rc:194 msgid "Shortcut: [1]" -msgstr "" +msgstr "Raccourci : [1]" #: dlls/msi/msi.rc:166 dlls/msi/msi.rc:197 dlls/msi/msi.rc:198 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [1]" -msgstr "Périp&hérique :" +msgstr "Service : [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "" +msgstr "Fichier : [1], Répertoire : [9], Taille : [6]" #: dlls/msi/msi.rc:168 -#, fuzzy -#| msgid "application" msgid "Found application: [1]" -msgstr "application" +msgstr "Application trouvée : [1]" #: dlls/msi/msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" msgstr "" #: dlls/msi/msi.rc:171 -#, fuzzy -#| msgid "De&vice:" msgid "Service: [2]" -msgstr "Périp&hérique :" +msgstr "Service : [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" msgstr "" #: dlls/msi/msi.rc:173 -#, fuzzy -#| msgid "Applications" msgid "Application: [1]" -msgstr "Applications" +msgstr "Application : [1]" #: dlls/msi/msi.rc:175 dlls/msi/msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" @@ -8795,10 +8609,8 @@ msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" msgstr "" #: dlls/msi/msi.rc:182 dlls/msi/msi.rc:203 -#, fuzzy -#| msgid "Extensions Only" msgid "Extension: [1]" -msgstr "Extensions uniquement" +msgstr "Extension : [1]" #: dlls/msi/msi.rc:183 dlls/msi/msi.rc:204 msgid "Font: [1]" @@ -9277,7 +9089,6 @@ msgid "expanded" msgstr "développé" #: dlls/oleacc/oleacc.rc:108 -#, fuzzy msgctxt "object state" msgid "collapsed" msgstr "réduit" @@ -9407,130 +9218,95 @@ msgid "Off" msgstr "Inactif" #: dlls/oledb32/version.rc:56 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "vidéo" +msgstr "Fournisseur" #: dlls/oledb32/version.rc:59 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Sélectionnez le format à utiliser :" +msgstr "Sélectionnez la donnée à laquelle vous souhaitez vous connecter :" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "LAN Connection" msgid "Connection" -msgstr "Connexion réseau local (LAN)" +msgstr "Connexion" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Specify the following to connect to ODBC data:" -msgstr "Sélectionnez le format à utiliser :" +msgstr "" +"Spécifiez les informations suivantes pour se connecter aux données ODBC :" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. La source des données :" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Veuillez saisir votre nom" +msgstr "Utiliser le nom de la source" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Connexions réinitialisées" +msgstr "Utiliser une chaîne de connexion" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "LAN Connection" msgid "&Connection string:" -msgstr "Connexion réseau local (LAN)" +msgstr "&Chaîne de connexion" #: dlls/oledb32/version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "Ajo&uter..." +msgstr "&Construire..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" msgstr "" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" msgstr "&Nom d'utilisateur :" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "Page &blanche" +msgstr "Mot de passe" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Mot de passe erroné.\n" +msgstr "Autoriser à mémoriser le mot de passe" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" msgstr "" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Connexions réinitialisées" +msgstr "&Tester la connexion" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Avancé" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Partage réseau" +msgstr "Paramètres réseau" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "Mauvais niveau d'emprunt d'identité.\n" +msgstr "&Niveau d'emprunt d'identité :" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" msgstr "" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" msgstr "Connecté" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "&Seconds" msgid "seconds." -msgstr "&Secondes" +msgstr "secondes" #: dlls/oledb32/version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Succès" +msgstr "A&ccès :" #: dlls/oledb32/version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" msgstr "&Tout" @@ -9541,10 +9317,8 @@ msgid "" msgstr "" #: dlls/oledb32/version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "&Modifier..." +msgstr "&Modifier valeur..." #: dlls/oledb32/version.rc:49 #, fuzzy @@ -9553,38 +9327,32 @@ msgid "Data Link Error" msgstr "Propriétés" #: dlls/oledb32/version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Sélectionnez un fichier." +msgstr "Sélectionnez un fournisseur." #: dlls/oledb32/version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"Le fournisseur n'est plus disponible. Veuillez-vous assurer que le " +"fournisseur est correctement installé." #: dlls/oledb32/version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Propriétés" +msgstr "Propriétés du lien de données" #: dlls/oledb32/version.rc:37 msgid "OLE DB Provider(s)" msgstr "" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Prêt" +msgstr "Lecture" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Lisez-moi :" +msgstr "Lecture/Ecriture" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" @@ -9603,10 +9371,8 @@ msgid "Share Exclusive" msgstr "" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "Écritures E/S" +msgstr "Écriture" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -10314,8 +10080,6 @@ msgid "Wine was brought to you by:" msgstr "Wine est une réalisation de :" #: dlls/shell32/shell32.rc:332 -#, fuzzy -#| msgid "&Run..." msgid "Run" msgstr "E&xécuter..." @@ -10338,10 +10102,8 @@ msgid "&Browse..." msgstr "&Parcourir..." #: dlls/shell32/shell32.rc:353 dlls/shell32/shell32.rc:382 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Type de fichier" +msgstr "Type de fichier :" #: dlls/shell32/shell32.rc:357 dlls/shell32/shell32.rc:390 #: dlls/urlmon/urlmon.rc:37 programs/explorer/explorer.rc:33 @@ -10354,16 +10116,12 @@ msgid "Size:" msgstr "Taille :" #: dlls/shell32/shell32.rc:363 dlls/shell32/shell32.rc:396 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Création" +msgstr "Création :" #: dlls/shell32/shell32.rc:367 dlls/shell32/shell32.rc:404 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Attributs :" +msgstr "Attributs :" #: dlls/shell32/shell32.rc:369 dlls/shell32/shell32.rc:406 #: programs/winefile/winefile.rc:173 @@ -10376,16 +10134,12 @@ msgid "&Archive" msgstr "&Archive" #: dlls/shell32/shell32.rc:384 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Ouvrir :" +msgstr "Ouvrir avec :" #: dlls/shell32/shell32.rc:387 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "Changer l'&icône..." +msgstr "&Changer l'&icône..." #: dlls/shell32/shell32.rc:398 #, fuzzy @@ -10798,10 +10552,8 @@ msgid " sec" msgstr " s" #: dlls/twain_32/twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Sélectionnez un dossier" +msgstr "Sélectionnez une source" #: dlls/tzres/tzres.rc:126 msgid "China Standard Time" @@ -10872,10 +10624,8 @@ msgid "(UTC-01:00) Cabo Verde Is." msgstr "" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Date and time" msgid "Haiti Standard Time" -msgstr "Date et heure" +msgstr "Heure d'Haïti" #: dlls/tzres/tzres.rc:184 #, fuzzy @@ -10888,10 +10638,8 @@ msgid "(UTC-05:00) Haiti" msgstr "" #: dlls/tzres/tzres.rc:111 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "Européen central" +msgstr "Heure d'Europe centrale" #: dlls/tzres/tzres.rc:112 #, fuzzy @@ -10924,10 +10672,8 @@ msgid "(UTC-08:00) Coordinated Universal Time-08" msgstr "" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Date and time" msgid "Altai Standard Time" -msgstr "Date et heure" +msgstr "Heure d'Altaï" #: dlls/tzres/tzres.rc:40 #, fuzzy @@ -10940,10 +10686,8 @@ msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "" #: dlls/tzres/tzres.rc:108 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "Européen central" +msgstr "Heure d'Europe centrale" #: dlls/tzres/tzres.rc:109 #, fuzzy @@ -10968,10 +10712,8 @@ msgid "(UTC+03:30) Tehran" msgstr "" #: dlls/tzres/tzres.rc:318 -#, fuzzy -#| msgid "Date and time" msgid "Saint Pierre Standard Time" -msgstr "Date et heure" +msgstr "Heure de Saint-Pierre" #: dlls/tzres/tzres.rc:319 #, fuzzy @@ -10980,10 +10722,8 @@ msgid "Saint Pierre Daylight Time" msgstr "Date et heure" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Date and time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "Date et heure" +msgstr "(UTC-03:00) Saint Pierre et Miquelon" #: dlls/tzres/tzres.rc:327 #, fuzzy @@ -11038,10 +10778,8 @@ msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" msgstr "" #: dlls/tzres/tzres.rc:171 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "Barre &standard" +msgstr "Heure GMT" #: dlls/tzres/tzres.rc:172 msgid "GMT Daylight Time" @@ -11052,10 +10790,8 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Date and time" msgid "South Sudan Standard Time" -msgstr "Date et heure" +msgstr "Heure du Sud Soudan" #: dlls/tzres/tzres.rc:343 #, fuzzy @@ -11140,10 +10876,8 @@ msgid "(UTC-03:30) Newfoundland" msgstr "" #: dlls/tzres/tzres.rc:348 -#, fuzzy -#| msgid "Date and time" msgid "Sudan Standard Time" -msgstr "Date et heure" +msgstr "Heure du Soudan" #: dlls/tzres/tzres.rc:349 #, fuzzy @@ -11280,10 +11014,8 @@ msgid "(UTC+14:00) Kiritimati Island" msgstr "" #: dlls/tzres/tzres.rc:129 -#, fuzzy -#| msgid "Date and time" msgid "Cuba Standard Time" -msgstr "Date et heure" +msgstr "Heure de Cuba" #: dlls/tzres/tzres.rc:130 #, fuzzy @@ -11328,10 +11060,8 @@ msgid "(UTC+04:00) Izhevsk, Samara" msgstr "" #: dlls/tzres/tzres.rc:417 -#, fuzzy -#| msgid "&Standard bar" msgid "Volgograd Standard Time" -msgstr "Barre &standard" +msgstr "Heure de Volgograd" #: dlls/tzres/tzres.rc:418 #, fuzzy @@ -11588,10 +11318,8 @@ msgid "Tomsk Standard Time" msgstr "Barre &standard" #: dlls/tzres/tzres.rc:367 -#, fuzzy -#| msgid "Date and time" msgid "Tomsk Daylight Time" -msgstr "Date et heure" +msgstr "Heure de Tomsk" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" @@ -11758,10 +11486,8 @@ msgid "(UTC+11:00) Sakhalin" msgstr "" #: dlls/tzres/tzres.rc:270 -#, fuzzy -#| msgid "&Standard bar" msgid "North Korea Standard Time" -msgstr "Barre &standard" +msgstr "Heure de Corée du Nord" #: dlls/tzres/tzres.rc:271 #, fuzzy @@ -12262,10 +11988,8 @@ msgid "W. Mongolia Standard Time" msgstr "Date et heure" #: dlls/tzres/tzres.rc:430 -#, fuzzy -#| msgid "Date and time" msgid "W. Mongolia Daylight Time" -msgstr "Date et heure" +msgstr "Heure de l'Ouest Mongolie" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" @@ -12300,10 +12024,8 @@ msgid "(UTC-10:00) Aleutian Islands" msgstr "" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "&Standard bar" msgid "Omsk Standard Time" -msgstr "Barre &standard" +msgstr "Heure d'Omsk" #: dlls/tzres/tzres.rc:274 #, fuzzy @@ -12680,60 +12402,44 @@ msgid "Overflow" msgstr "" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "Mémoire insuffisante." +msgstr "Mémoire insuffisante" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" msgstr "" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Discordance de type de données.\n" +msgstr "Discordance de type" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "Erreur de périphérique d'E/S.\n" +msgstr "Erreur de périphérique d'E/S" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "Le fichier existe déjà.\n" +msgstr "Le fichier existe déjà" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "Disque plein.\n" +msgstr "Disque plein" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Trop de fichiers ouverts.\n" +msgstr "Trop de fichiers ouverts" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "Accès refusé.\n" +msgstr "Accès refusé" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" msgstr "" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "Chemin introuvable.\n" +msgstr "Chemin introuvable" #: dlls/vbscript/vbscript.rc:43 #, fuzzy @@ -12742,36 +12448,28 @@ msgid "Object variable not set" msgstr "(valeur non définie)" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Tampon utilisateur invalide.\n" +msgstr "Utilisation non valide de Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" msgstr "" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "Le serveur d'automatisation ne peut créer l'objet" +msgstr "Le composant ActiveX ne peut créer l'objet" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "Cet objet ne supporte pas cette action" +msgstr "La classe ne supporte pas l'automatisation" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" msgstr "" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "Cet objet ne supporte pas cette action" +msgstr "Cet objet ne supporte pas les arguments nommés" #: dlls/vbscript/vbscript.rc:52 #, fuzzy @@ -12780,26 +12478,20 @@ msgid "Object doesn't support current locale setting" msgstr "Cet objet ne supporte pas cette action" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "Élément introuvable.\n" +msgstr "Élément nommé introuvable" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" msgstr "" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Violation de classe d'objet" +msgstr "L'objet n'est pas une collection" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "Le contrôle spécifié n'a pas été trouvé dans le message" +msgstr "La fonction spécifiée n'a pas été trouvée dans la DLL" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" @@ -12925,16 +12617,12 @@ msgid "Security Protocol" msgstr "Sécurité" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "Signature" +msgstr "Type de signature" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Système de fichiers chiffré (EFS)" +msgstr "Type d'encryption" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" @@ -12945,38 +12633,28 @@ msgid "bits" msgstr "" #: dlls/wininet/winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "Expiration du délai d'attente du service.\n" +msgstr "Expiration du délai d'attente de la requête.\n" #: dlls/wininet/winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Une erreur d'impression s'est produite." +msgstr "Une erreur interne s'est produite.\n" #: dlls/wininet/winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Chemin invalide.\n" +msgstr "L'URL est invalide.\n" #: dlls/wininet/winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" msgstr "" #: dlls/wininet/winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Nom d'utilisateur introuvable.\n" +msgstr "Le nom du serveur n'a pas pu être résolu.\n" #: dlls/wininet/winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Le profil utilisateur est invalide.\n" +msgstr "L'opération demandée n'est pas valide.\n" #: dlls/wininet/winineterror.mc:56 msgid "" @@ -12985,16 +12663,12 @@ msgid "" msgstr "" #: dlls/wininet/winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Le profil n'a pu être ajouté.\n" +msgstr "L'item requis n'a pas pu être localisé.\n" #: dlls/wininet/winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Impossible de se connecter au serveur LDAP" +msgstr "La tentative de connexion au serveur a échoué.\n" #: dlls/wininet/winineterror.mc:71 msgid "The connection with the server has been terminated.\n" @@ -13521,13 +13195,13 @@ msgid "Any compatible waveform recording device may be used." msgstr "N'importe quel périphérique audio d'enregistrement peut être utilisé." #: dlls/winmm/winmm.rc:118 -#, fuzzy msgid "" "No wave device that can play files in the current format is installed. Use " "the Drivers option to install the wave device." msgstr "" -"Aucun périphérique audio capable de jouer des fichiers dans le format en " -"cours n'est présent. " +"Aucun périphérique audio capable de jouer des fichiers dans le formaten " +"cours n'est présent. Utiliser l'option pour installer des périphériques " +"audio." #: dlls/winmm/winmm.rc:119 msgid "" @@ -13537,7 +13211,6 @@ msgstr "" "Ce périphérique ne parvient pas à reconnaître le format du fichier actuel." #: dlls/winmm/winmm.rc:120 -#, fuzzy msgid "" "No wave device that can record files in the current format is installed. Use " "the Drivers option to install the wave device." @@ -13562,10 +13235,6 @@ msgstr "" "horaire SMPTE en même temps." #: dlls/winmm/winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -13587,10 +13256,6 @@ msgid "An error occurred with the specified port." msgstr "Une erreur est survenue sur le port spécifié." #: dlls/winmm/winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -13968,13 +13633,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Code de pages actif : %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Message invalide.\n" +msgstr "Code de pages invalide.\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13987,6 +13650,15 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [nombre]\n" +"\n" +" Modifie ou affiche le code de pages de la console actif.\n" +"\n" +" nombre Le code de pages de la console à activer.\n" +"\n" +" Lancer CHCP sans nombre en paramètre pour afficher le code de pages actif " +"de la console.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -14595,47 +14267,6 @@ msgstr "" "d'exploitation ou au shell où vous avez invoqué cmd.\n" #: programs/cmd/cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -14696,6 +14327,7 @@ msgstr "" "\t\ttypes de fichiers\n" "HELP\t\tAffiche de brefs détails sur l'utilisation d'une commande\n" "MD (MKDIR)\tCrée un répertoire\n" +"MKLINK\t\tCrée un lien symbolique\n" "MORE\t\tAffiche du texte par pages\n" "MOVE\t\tDéplace un fichier, un groupe de fichiers ou un répertoire\n" "PATH\t\tRègle ou affiche le chemin de recherche\n" @@ -15123,10 +14755,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Erreur : option « %c » invalide.\n" #: programs/hostname/hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Erreur : processus « %1 » introuvable.\n" +msgstr "Erreur: Impossible d'obtenir le nom d'hôte: %u.\n" #: programs/hostname/hostname.rc:33 msgid "" @@ -16267,40 +15897,24 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "Tapez « REG %1 /? » pour de l'aide.\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "" -"reg : le système n'a pas pu trouver la clé ou valeur de registre spécifiée\n" +msgstr "reg : impossible d'accéder ou de créer la clé de registre spécifiée\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "L'opération s'est terminée avec succès\n" +msgstr "reg : L'opération s'est terminée avec succès\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "L'operation sur le registre a été annulée\n" +msgstr "reg : L'operation sur le registre a été annulée\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "" -"reg : le système n'a pas pu trouver la clé ou valeur de registre spécifiée\n" +msgstr "reg : le système n'a pas pu trouver la clé de registre spécifiée\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "" -"reg : le système n'a pas pu trouver la clé ou valeur de registre spécifiée\n" +msgstr "reg : le système n'a pas pu trouver la valeur de registre spécifiée\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -16311,17 +15925,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "Tapez « REG /? » pour de l'aide.\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -16337,7 +15940,7 @@ msgstr "" " REG [opération] [paramètres]\n" "\n" "Opérations prises en charge :\n" -" ADD | DELETE | QUERY\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Pour de l'aide sur une opération spécifique, tapez :\n" " REG [opération] /?\n" @@ -16555,28 +16158,22 @@ msgid "" msgstr "" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg : nom de clé invalide\n" +msgstr "reg : clé de registre invalide\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg : impossible d'accéder à une machine distante\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid system key\n" -msgstr "reg : nom de clé invalide\n" +msgstr "reg : clé système invalide\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg : option [%1] invalide. " #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" msgstr "" "reg : l'option [/d] doit être suivie d'une valeur hexadécimale valide\n" @@ -16612,12 +16209,11 @@ msgid "reg: The source and destination keys cannot be the same\n" msgstr "" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "La valeur de registre « %1 » existe déjà. Voulez-vous la remplacer ?" +msgstr "" +"La valeur de registre « %1\\\\%2 » existe déjà. Voulez-vous la remplacer ?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" @@ -16633,34 +16229,25 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit : impossible d'effacer la classe de registre « %1 ».\n" +msgstr "" +"reg : impossible d'effacer toutes les valeurs de registre dans « %1 ».\n" #: programs/reg/reg.rc:173 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "La valeur de registre « %1 » existe déjà. Voulez-vous la remplacer ?" +msgstr "Le fichier « %1 » existe déjà. Voulez-vous la remplacer ?" #: programs/reg/reg.rc:151 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit : séquence d'échappement non reconnue [\\%1!c!]\n" +msgstr "reg : séquence d'échappement non reconnue [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "reg : impossible d'ouvrir la clé de registre « %1 ».\n" #: programs/reg/reg.rc:150 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit : le fichier « %1 » est introuvable.\n" +msgstr "reg : le fichier « %1 » est introuvable.\n" #: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" @@ -16748,15 +16335,10 @@ msgstr "À &propos de l'éditeur du registre" #: programs/regedit/regedit.rc:89 programs/regedit/regedit.rc:96 #: programs/regedit/regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "développé" +msgstr "Développer" #: programs/regedit/regedit.rc:134 programs/regedit/regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." msgstr "Modifier les données &binaires..." @@ -16859,10 +16441,6 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Contient des commandes pour accéder aux clés fréquemment utilisées" #: programs/regedit/regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" @@ -16906,52 +16484,44 @@ msgid "(unknown %d)" msgstr "(%d inconnu)" #: programs/regedit/regedit.rc:247 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible de modifier la clé de registre sélectionnée." #: programs/regedit/regedit.rc:248 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible de créer un nouvelle clé de registre." #: programs/regedit/regedit.rc:249 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible de créer une nouvelle valeur registre." #: programs/regedit/regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Impossible de renommer la clé '%1'.\n" +"Le nom spécifié existe déjà." #: programs/regedit/regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Impossible de changer la valeur '%1'.\n" +"Le nom de valeur spécifié existe déjà." #: programs/regedit/regedit.rc:252 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible d'enlever la clé de registre sélectionnée." #: programs/regedit/regedit.rc:253 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible de renommer la clé de registre sélectionnée." #: programs/regedit/regedit.rc:254 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible de renommer la clé de registre sélectionnée." #: programs/regedit/regedit.rc:255 msgid "" @@ -16959,48 +16529,11 @@ msgid "" msgstr "" #: programs/regedit/regedit.rc:256 -#, fuzzy -#| msgid "" -#| "regedit: Unable to export '%1'. The specified registry key was not " -#| "found.\n" msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"regedit : impossible d'exporter « %1 ». La clé de registre spécifiée est " -"introuvable.\n" +"Impossible d'importer « %1 ». La clé de registre spécifiée est introuvable." #: programs/regedit/regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -17111,10 +16644,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit : séquence d'échappement non reconnue [\\%1!c!]\n" #: programs/regedit/regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit : type de données de registre non pris en charge [%1]\n" +msgstr "regedit : type de données de registre non pris en charge [0x%1!x!]\n" #: programs/regedit/regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -17134,11 +16665,10 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" #: programs/regedit/regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "regedit : type de données de registre [%1] rencontré dans [%2].\n" +msgstr "" +"regedit : type de données de registre [0x%1!x!] rencontré dans « %2 ».\n" #: programs/regedit/regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" @@ -17146,10 +16676,8 @@ msgstr "" "regedit : la valeur de registre « %1 » sera exportée comme donnée binaire.\n" #: programs/regedit/regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg : nom de clé invalide\n" +msgstr "regedit: Clé système non valide [%1]\n" #: programs/regedit/regedit.rc:428 msgid "" @@ -17159,20 +16687,14 @@ msgstr "" "introuvable.\n" #: programs/regedit/regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit : impossible d'effacer la classe de registre « %1 ».\n" +msgstr "regedit : impossible d'effacer la clé de registre « %1 ».\n" #: programs/regedit/regedit.rc:431 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit : la ligne « %1 » n'a pas été reconnue.\n" +msgstr "regedit : la ligne « %1 » contient une syntaxe non reconnue.\n" #: programs/regedit/regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Quitte l'éditeur du registre" @@ -17189,8 +16711,6 @@ msgid "Shows or hides the status bar" msgstr "Affiche ou masque la barre d'état" #: programs/regedit/regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Modifie la position du séparateur entre les deux panneaux" @@ -17236,10 +16756,8 @@ msgid "Adds a new binary value" msgstr "Ajoute une nouvelle valeur binaire" #: programs/regedit/regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Ajoute une nouvelle valeur binaire" +msgstr "Ajoute une nouvelle valeur de 32 bits" #: programs/regedit/regedit.rc:177 msgid "Imports a text file into the registry" @@ -17254,10 +16772,8 @@ msgid "Prints all or part of the registry" msgstr "Imprime tout ou partie du registre" #: programs/regedit/regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Éditeur du registre" +msgstr "Ouvre l'aide de l'Éditeur du registre" #: programs/regedit/regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -17266,38 +16782,28 @@ msgstr "" "copyright" #: programs/regedit/regedit.rc:206 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible d'ouvrir la clé de registre « %1 »." #: programs/regedit/regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Ne peut éditer de clé du type %u" +msgstr "Ne peut éditer de clé du type (%1!u!)." #: programs/regedit/regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "La valeur est trop grande (%u)" +msgstr "La valeur est trop grande (%1!u!)." #: programs/regedit/regedit.rc:209 msgid "Confirm Value Delete" msgstr "Confirmez l'effacement de valeur" #: programs/regedit/regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Voulez-vous réellement supprimer la valeur de registre « %1 » ?" +msgstr "Voulez-vous réellement supprimer la valeur de registre sélectionnée ?" #: programs/regedit/regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Occurrence de « %s » non trouvée" +msgstr "Recherche terminée. Occurrence de « %1 » non trouvée." #: programs/regedit/regedit.rc:211 msgid "Are you sure you want to delete these values?" @@ -17312,54 +16818,43 @@ msgid "New Value #%d" msgstr "Nouvelle valeur #%d" #: programs/regedit/regedit.rc:205 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit : impossible d'ouvrir la clé de registre « %1 ».\n" +msgstr "Impossible d'ouvrir la clé de registre « %1 »." #: programs/regedit/regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Modifie les données d'une valeur" +msgstr "Modifie les données d'une valeur sous forme binaire" #: programs/regedit/regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Ajoute une nouvelle valeur chaîne extensible" #: programs/regedit/regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Exporte la branche du registre sélectionnée dans un fichier texte" #: programs/regedit/regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Ajoute une nouvelle valeur chaîne" +msgstr "Ajoute une nouvelle valeur de chaîne extensible" #: programs/regedit/regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Confirmez l'effacement de valeur" +msgstr "Confirmez l'effacement de la clé" #: programs/regedit/regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?" +msgstr "" +"Voulez-vous réellement supprimer cette clé de registre ainsi que toutes ses " +"sous-clés ?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" msgstr "" #: programs/regedit/regedit.rc:231 -#, fuzzy msgid "Collapse" -msgstr "réduit" +msgstr "Réduire" #: programs/regsvr32/regsvr32.rc:33 msgid "" @@ -17448,37 +16943,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32 : DLL « %1 » désinstallée avec succès\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -17537,6 +17001,7 @@ msgstr "" " son code de sortie.\n" "/unix Interpréter fichier_programme ou fichier_document comme un\n" " chemin Unix.\n" +"/exec Ouvrir le fichier spécifié (usage interne à Wine).\\n\"\n" "/ProgIDOpen Ouvrir un document via le programme identifié par progID.\n" "/? Afficher cette aide et se terminer.\n" @@ -18689,15 +18154,11 @@ msgid "Drive configuration" msgstr "Configuration des lecteurs" #: programs/winecfg/winecfg.rc:232 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." msgstr "" -"N'a pu se connecter au gestionnaire de montage : la configuration du lecteur " +"N'a pu se connecter au gestionnaire de montage ; la configuration du lecteur " "n'a pu être éditée." #: programs/winecfg/winecfg.rc:235 @@ -18980,12 +18441,6 @@ msgid "System drive" msgstr "Lecteur système" #: programs/winecfg/winecfg.rc:75 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -19415,10 +18870,8 @@ msgid "&Beginner" msgstr "&Débutant" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Interface" +msgstr "&Intermédaire" #: programs/winemine/winemine.rc:46 msgid "&Expert" @@ -19449,20 +18902,16 @@ msgid "Beginner" msgstr "Débutant" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Interface" +msgstr "Intermédiaire" #: programs/winemine/winemine.rc:66 msgid "Expert" msgstr "Expert" #: programs/winemine/winemine.rc:74 programs/winemine/winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Résultat" +msgstr "Effacer les résultats" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" @@ -19852,8 +19301,6 @@ msgid "Text documents (*.txt)" msgstr "Documents texte (*.txt)" #: programs/wordpad/wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" msgstr "Documents texte Unicode (*.txt)" @@ -20059,41 +19506,6 @@ msgid "D" msgstr "R" #: programs/xcopy/xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -20161,6 +19573,9 @@ msgstr "" "[/A] Ne copier que les fichiers ayant l'attribut archive défini.\n" "[/M] Ne copier que les fichiers ayant l'attribut archive défini ; supprime\n" " ensuite l'attribut.\n" +"[/K] Copier les attributs de fichier; sans cette option, les attributes ne " +"sont\n" +"pas préservés.\n" "[/D | /D:m-j-a] Ne copier que les nouveaux fichiers, ou ceux modifiés après " "la\n" "\t\tdate spécifiée. Si aucune date n'est fournie, ne copier que si\n"

1 1

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 01 Jan '22

01 Jan '22

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 1865 ++++++++++++++++++++++----------------------------- 1 file changed, 796 insertions(+), 1069 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e4860d4f83e..e793bf7d288 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -21,26 +21,20 @@ msgid "Security" msgstr "安全" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "用户名(&U)：" +msgstr "用户组或用户名(&G):" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "黄色" +msgstr "允许" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "拒绝" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "没有权限" +msgstr "%1 的权限" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -122,39 +116,39 @@ msgstr "确定" #: dlls/appwiz.cpl/appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "%s 技术支持信息：" +msgstr "以下信息可用于寻求 %s 的技术支持:" #: dlls/appwiz.cpl/appwiz.rc:80 msgid "Publisher:" -msgstr "生产商：" +msgstr "生产商:" #: dlls/appwiz.cpl/appwiz.rc:81 programs/winefile/winefile.rc:165 msgid "Version:" -msgstr "版本：" +msgstr "版本:" #: dlls/appwiz.cpl/appwiz.rc:82 msgid "Contact:" -msgstr "联系人：" +msgstr "联系人:" #: dlls/appwiz.cpl/appwiz.rc:83 msgid "Support Information:" -msgstr "支持信息：" +msgstr "支持信息:" #: dlls/appwiz.cpl/appwiz.rc:84 msgid "Support Telephone:" -msgstr "支持电话：" +msgstr "支持电话:" #: dlls/appwiz.cpl/appwiz.rc:85 msgid "Readme:" -msgstr "产品说明：" +msgstr "产品说明:" #: dlls/appwiz.cpl/appwiz.rc:86 msgid "Product Updates:" -msgstr "产品更新：" +msgstr "产品更新:" #: dlls/appwiz.cpl/appwiz.rc:87 msgid "Comments:" -msgstr "备注：" +msgstr "备注:" #: dlls/appwiz.cpl/appwiz.rc:100 msgid "Wine Gecko Installer" @@ -251,7 +245,7 @@ msgstr "添加/删除程序" msgid "" "Allows you to install new software, or remove existing software from your " "computer." -msgstr "允许你安装新软件或删除现有程序。" +msgstr "允许您安装新软件，或从您的计算机删除现有的软件。" #: dlls/appwiz.cpl/appwiz.rc:33 programs/taskmgr/taskmgr.rc:262 #: programs/winecfg/winecfg.rc:32 @@ -322,7 +316,7 @@ msgstr "压缩选项" #: dlls/avifil32/avifil32.rc:45 msgid "&Choose a stream:" -msgstr "选择来源流(&C)：" +msgstr "选择来源流(&C):" #: dlls/avifil32/avifil32.rc:48 programs/wordpad/wordpad.rc:76 msgid "&Options..." @@ -330,7 +324,7 @@ msgstr "选项(&O)..." #: dlls/avifil32/avifil32.rc:49 msgid "&Interleave every" -msgstr "交织(&I)：每" +msgstr "交织(&I): 每隔" #: dlls/avifil32/avifil32.rc:51 dlls/msvfw32/msvfw32.rc:51 msgid "frames" @@ -338,11 +332,11 @@ msgstr "帧数" #: dlls/avifil32/avifil32.rc:52 msgid "Current format:" -msgstr "当前格式：" +msgstr "当前格式:" #: dlls/avifil32/avifil32.rc:30 msgid "Waveform: %s" -msgstr "波形：%s" +msgstr "波形: %s" #: dlls/avifil32/avifil32.rc:31 msgid "Waveform" @@ -467,7 +461,7 @@ msgstr "下移(&D)" #: dlls/comctl32/comctl32.rc:105 msgid "A&vailable buttons:" -msgstr "可用工具栏按钮(&V)：" +msgstr "可用工具栏按钮(&V):" #: dlls/comctl32/comctl32.rc:107 msgid "&Add ->" @@ -479,7 +473,7 @@ msgstr "<- 删除(&R)" #: dlls/comctl32/comctl32.rc:109 msgid "&Toolbar buttons:" -msgstr "当前工具栏按钮(&T)：" +msgstr "当前工具栏按钮(&T):" #: dlls/comctl32/comctl32.rc:42 msgid "Separator" @@ -521,7 +515,7 @@ msgstr "关闭" #: dlls/comctl32/comctl32.rc:36 msgid "Today:" -msgstr "今天：" +msgstr "今天:" #: dlls/comctl32/comctl32.rc:37 msgid "Go to today" @@ -536,19 +530,19 @@ msgstr "打开" #: dlls/comdlg32/comdlg32.rc:161 dlls/comdlg32/comdlg32.rc:183 msgid "File &Name:" -msgstr "文件名(&N)：" +msgstr "文件名(&N):" #: dlls/comdlg32/comdlg32.rc:164 dlls/comdlg32/comdlg32.rc:186 msgid "&Directories:" -msgstr "文件夹(&D)：" +msgstr "文件夹(&D):" #: dlls/comdlg32/comdlg32.rc:167 dlls/comdlg32/comdlg32.rc:189 msgid "List Files of &Type:" -msgstr "文件类型(&T)：" +msgstr "文件类型(&T):" #: dlls/comdlg32/comdlg32.rc:169 dlls/comdlg32/comdlg32.rc:191 msgid "Dri&ves:" -msgstr "驱动器(&V)：" +msgstr "驱动器(&V):" #: dlls/comdlg32/comdlg32.rc:174 dlls/comdlg32/comdlg32.rc:196 #: dlls/shell32/shell32.rc:368 dlls/shell32/shell32.rc:405 @@ -572,7 +566,7 @@ msgstr "打印" #: dlls/comdlg32/comdlg32.rc:205 msgid "Printer:" -msgstr "打印机：" +msgstr "打印机:" #: dlls/comdlg32/comdlg32.rc:207 dlls/comdlg32/comdlg32.rc:375 msgid "Print range" @@ -597,15 +591,15 @@ msgstr "设置(&S)" #: dlls/comdlg32/comdlg32.rc:214 msgid "&From:" -msgstr "从(&F)：" +msgstr "从(&F):" #: dlls/comdlg32/comdlg32.rc:215 msgid "&To:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:216 dlls/wineps.drv/wineps.rc:42 msgid "Print &Quality:" -msgstr "打印质量(&Q)：" +msgstr "打印质量(&Q):" #: dlls/comdlg32/comdlg32.rc:218 msgid "Print to Fi&le" @@ -669,16 +663,16 @@ msgstr "字体" #: dlls/comdlg32/comdlg32.rc:254 msgid "&Font:" -msgstr "字体(&F)：" +msgstr "字体(&F):" #: dlls/comdlg32/comdlg32.rc:257 msgid "Font St&yle:" -msgstr "字体样式(&Y)：" +msgstr "字体样式(&Y):" #: dlls/comdlg32/comdlg32.rc:260 dlls/comdlg32/comdlg32.rc:439 #: programs/winecfg/winecfg.rc:292 msgid "&Size:" -msgstr "大小(&S)：" +msgstr "大小(&S):" #: dlls/comdlg32/comdlg32.rc:267 msgid "Effects" @@ -694,7 +688,7 @@ msgstr "下划线(&U)" #: dlls/comdlg32/comdlg32.rc:270 programs/winecfg/winecfg.rc:290 msgid "&Color:" -msgstr "配色(&C)：" +msgstr "配色(&C):" #: dlls/comdlg32/comdlg32.rc:273 msgid "Sample" @@ -710,11 +704,11 @@ msgstr "颜色" #: dlls/comdlg32/comdlg32.rc:286 msgid "&Basic Colors:" -msgstr "基本颜色(&B)：" +msgstr "基本颜色(&B):" #: dlls/comdlg32/comdlg32.rc:287 msgid "&Custom Colors:" -msgstr "自定义颜色(&C)：" +msgstr "自定义颜色(&C):" #: dlls/comdlg32/comdlg32.rc:289 msgid "|S&olid" @@ -722,29 +716,29 @@ msgstr "|纯色(&O)" #: dlls/comdlg32/comdlg32.rc:290 msgid "&Red:" -msgstr "红(&R)：" +msgstr "红(&R):" #: dlls/comdlg32/comdlg32.rc:292 msgid "&Green:" -msgstr "绿(&G)：" +msgstr "绿(&G):" #: dlls/comdlg32/comdlg32.rc:294 msgid "&Blue:" -msgstr "蓝(&B)：" +msgstr "蓝(&B):" #: dlls/comdlg32/comdlg32.rc:296 msgid "&Hue:" -msgstr "色调(&E)：" +msgstr "色调(&E):" #: dlls/comdlg32/comdlg32.rc:298 msgctxt "Saturation" msgid "&Sat:" -msgstr "饱和度(&S)：" +msgstr "饱和度(&S):" #: dlls/comdlg32/comdlg32.rc:300 msgctxt "Luminance" msgid "&Lum:" -msgstr "亮度(&L)：" +msgstr "亮度(&L):" #: dlls/comdlg32/comdlg32.rc:310 msgid "&Add to Custom Colors" @@ -766,7 +760,7 @@ msgstr "查找" #: dlls/comdlg32/comdlg32.rc:321 dlls/comdlg32/comdlg32.rc:340 msgid "Fi&nd What:" -msgstr "查找(&N)：" +msgstr "查找(&N):" #: dlls/comdlg32/comdlg32.rc:323 dlls/comdlg32/comdlg32.rc:344 msgid "Match &Whole Word Only" @@ -798,7 +792,7 @@ msgstr "替换" #: dlls/comdlg32/comdlg32.rc:342 msgid "Re&place With:" -msgstr "替换为(&P)：" +msgstr "替换为(&P):" #: dlls/comdlg32/comdlg32.rc:348 msgid "&Replace" @@ -822,23 +816,23 @@ msgstr "打印到文件(&L)" #: dlls/comdlg32/comdlg32.rc:365 dlls/comdlg32/comdlg32.rc:401 #: dlls/msacm32/msacm32.rc:34 programs/winefile/winefile.rc:137 msgid "&Name:" -msgstr "名称(&N)：" +msgstr "名称(&N):" #: dlls/comdlg32/comdlg32.rc:366 dlls/comdlg32/comdlg32.rc:404 msgid "Status:" -msgstr "状态：" +msgstr "状态:" #: dlls/comdlg32/comdlg32.rc:368 dlls/comdlg32/comdlg32.rc:406 msgid "Type:" -msgstr "型号：" +msgstr "型号:" #: dlls/comdlg32/comdlg32.rc:370 dlls/comdlg32/comdlg32.rc:408 msgid "Where:" -msgstr "位置：" +msgstr "位置:" #: dlls/comdlg32/comdlg32.rc:372 dlls/comdlg32/comdlg32.rc:410 msgid "Comment:" -msgstr "备注：" +msgstr "备注:" #: dlls/comdlg32/comdlg32.rc:377 msgid "Pa&ges" @@ -850,11 +844,11 @@ msgstr "选中的范围(&S)" #: dlls/comdlg32/comdlg32.rc:381 msgid "&from:" -msgstr "从(&F)：" +msgstr "从(&F):" #: dlls/comdlg32/comdlg32.rc:382 msgid "&to:" -msgstr "到(&T)：" +msgstr "到(&T):" #: dlls/comdlg32/comdlg32.rc:384 msgid "Copies" @@ -862,7 +856,7 @@ msgstr "份数" #: dlls/comdlg32/comdlg32.rc:385 msgid "Number of &copies:" -msgstr "份数(&C)：" +msgstr "份数(&C):" #: dlls/comdlg32/comdlg32.rc:387 msgid "C&ollate" @@ -874,7 +868,7 @@ msgstr "大小(&Z):" #: dlls/comdlg32/comdlg32.rc:416 msgid "&Source:" -msgstr "纸张来源(&S)：" +msgstr "纸张来源(&S):" #: dlls/comdlg32/comdlg32.rc:421 msgid "P&ortrait" @@ -890,7 +884,7 @@ msgstr "页面设置" #: dlls/comdlg32/comdlg32.rc:441 msgid "&Tray:" -msgstr "托盘(&T)：" +msgstr "托盘(&T):" #: dlls/comdlg32/comdlg32.rc:444 dlls/wineps.drv/wineps.rc:35 msgid "&Portrait" @@ -898,19 +892,19 @@ msgstr "纵向(&P)" #: dlls/comdlg32/comdlg32.rc:447 msgid "L&eft:" -msgstr "左(&E)：" +msgstr "左(&E):" #: dlls/comdlg32/comdlg32.rc:449 programs/notepad/notepad.rc:112 msgid "&Right:" -msgstr "右(&R)：" +msgstr "右(&R):" #: dlls/comdlg32/comdlg32.rc:451 msgid "T&op:" -msgstr "上(&O)：" +msgstr "上(&O):" #: dlls/comdlg32/comdlg32.rc:453 programs/notepad/notepad.rc:114 msgid "&Bottom:" -msgstr "下(&B)：" +msgstr "下(&B):" #: dlls/comdlg32/comdlg32.rc:457 msgid "P&rinter..." @@ -918,7 +912,7 @@ msgstr "打印机(&P)..." #: dlls/comdlg32/comdlg32.rc:465 dlls/comdlg32/comdlg32.rc:490 msgid "Look &in:" -msgstr "浏览(&I)：" +msgstr "浏览(&I):" #: dlls/comdlg32/comdlg32.rc:471 dlls/comdlg32/comdlg32.rc:497 msgid "File &name:" @@ -926,7 +920,7 @@ msgstr "文件名(&N):" #: dlls/comdlg32/comdlg32.rc:475 dlls/comdlg32/comdlg32.rc:501 msgid "Files of &type:" -msgstr "文件类型(&T)：" +msgstr "文件类型(&T):" #: dlls/comdlg32/comdlg32.rc:478 dlls/comdlg32/comdlg32.rc:504 msgid "Open as &read-only" @@ -940,11 +934,11 @@ msgstr "打开(&O)" #: dlls/comdlg32/comdlg32.rc:517 msgid "File name:" -msgstr "文件名：" +msgstr "文件名:" #: dlls/comdlg32/comdlg32.rc:520 msgid "Files of type:" -msgstr "文件类型：" +msgstr "文件类型:" #: dlls/comdlg32/comdlg32.rc:33 dlls/vbscript/vbscript.rc:35 msgid "File not found" @@ -960,7 +954,7 @@ msgid "" "Do you want to create file?" msgstr "" "文件不存在。\n" -"是否创建新文件？" +"是否创建新文件?" #: dlls/comdlg32/comdlg32.rc:36 msgid "" @@ -968,7 +962,7 @@ msgid "" "Do you want to replace it?" msgstr "" "文件已经存在。\n" -"是否替换？" +"是否替换?" #: dlls/comdlg32/comdlg32.rc:37 msgid "Invalid character(s) in path" @@ -979,7 +973,7 @@ msgid "" "A filename cannot contain any of the following characters:\n" " / : < > |" msgstr "" -"文件名中不能包含任何以下字符：\n" +"文件名中不能包含任何以下字符:\n" " / : < > |" #: dlls/comdlg32/comdlg32.rc:39 @@ -1128,7 +1122,7 @@ msgid "" "This large number of copies is not supported by your printer.\n" "Please enter a value between 1 and %d." msgstr "" -"你的打印机不支持这么大的份数。\n" +"您的打印机不支持这么大的份数。\n" "请输入一个 1 和 %d 之间的数。" #: dlls/comdlg32/comdlg32.rc:68 @@ -1171,7 +1165,7 @@ msgstr "保存(&S)" #: dlls/comdlg32/comdlg32.rc:144 msgid "Save &in:" -msgstr "保存在(&I)：" +msgstr "保存在(&I):" #: dlls/comdlg32/comdlg32.rc:145 msgid "Save" @@ -1316,12 +1310,12 @@ msgstr "毫米" #: dlls/credui/credui.rc:45 msgid "&User name:" -msgstr "用户名(&U)：" +msgstr "用户名(&U):" #: dlls/credui/credui.rc:48 dlls/cryptui/cryptui.rc:402 #: dlls/oledb32/version.rc:81 msgid "&Password:" -msgstr "密码(&P)：" +msgstr "密码(&P):" #: dlls/credui/credui.rc:50 msgid "&Remember my password" @@ -1344,7 +1338,7 @@ msgid "" "Make sure that your user name\n" "and password are correct." msgstr "" -"请确认你输入的用户名和密码\n" +"请确认您输入的用户名和密码\n" "是否正确。" #: dlls/credui/credui.rc:35 @@ -1354,9 +1348,9 @@ msgid "" "Press the Caps Lock key on your keyboard to turn off Caps Lock before\n" "entering your password." msgstr "" -"开着大写锁定可能导致你输入错误的密码。\n" +"开着大写锁定可能导致您输入错误的密码。\n" "\n" -"建议你按下键盘上的 Caps Lock 键以关闭大写锁定，然后再输入密码。" +"建议您按下键盘上的 Caps Lock 键以关闭大写锁定，然后再输入密码。" #: dlls/credui/credui.rc:34 msgid "Caps Lock is On" @@ -1541,7 +1535,7 @@ msgstr "组织单元" #: dlls/crypt32/crypt32.rc:74 msgid "Common Name" -msgstr "通用名" +msgstr "公用名" #: dlls/crypt32/crypt32.rc:75 msgid "Locality" @@ -2188,7 +2182,7 @@ msgstr "证书策略" #: dlls/cryptdlg/cryptdlg.rc:31 msgid "Policy Identifier: " -msgstr "策略标识符：" +msgstr "策略标识符:" #: dlls/cryptdlg/cryptdlg.rc:32 msgid "Policy Qualifier Info" @@ -2234,7 +2228,7 @@ msgstr "颁发者声明(&S)" #: dlls/cryptui/cryptui.rc:205 msgid "&Show:" -msgstr "显示(&S)：" +msgstr "显示(&S):" #: dlls/cryptui/cryptui.rc:210 msgid "&Edit Properties..." @@ -2258,7 +2252,7 @@ msgstr "查看证书(&V)" #: dlls/cryptui/cryptui.rc:223 msgid "Certificate &status:" -msgstr "证书状态(&S)：" +msgstr "证书状态(&S):" #: dlls/cryptui/cryptui.rc:229 msgid "Disclaimer" @@ -2270,12 +2264,12 @@ msgstr "更多信息(&I)" #: dlls/cryptui/cryptui.rc:244 msgid "&Friendly name:" -msgstr "易记名称(&F)：" +msgstr "易记名称(&F):" #: dlls/cryptui/cryptui.rc:246 programs/progman/progman.rc:154 #: programs/progman/progman.rc:170 msgid "&Description:" -msgstr "描述(&D)：" +msgstr "描述(&D):" #: dlls/cryptui/cryptui.rc:248 msgid "Certificate purposes" @@ -2291,7 +2285,7 @@ msgstr "禁用此证书的所有用途(&I)" #: dlls/cryptui/cryptui.rc:253 msgid "Enable &only the following purposes for this certificate:" -msgstr "仅启用此证书的如下用途(&O)：" +msgstr "仅启用此证书的如下用途(&O):" #: dlls/cryptui/cryptui.rc:258 msgid "Add &Purpose..." @@ -2304,7 +2298,7 @@ msgstr "添加用途" #: dlls/cryptui/cryptui.rc:265 msgid "" "Add the object identifier (OID) for the certificate purpose you wish to add:" -msgstr "为您要添加的证书用途添加对象识别 (OID) ：" +msgstr "为您要添加的证书用途添加对象识别 (OID):" #: dlls/cryptui/cryptui.rc:273 dlls/cryptui/cryptui.rc:69 msgid "Select Certificate Store" @@ -2349,7 +2343,7 @@ msgstr "" #: dlls/cryptui/cryptui.rc:299 dlls/cryptui/cryptui.rc:435 msgid "&File name:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: dlls/cryptui/cryptui.rc:301 dlls/cryptui/cryptui.rc:323 #: dlls/cryptui/cryptui.rc:437 programs/winecfg/winecfg.rc:311 @@ -2360,7 +2354,7 @@ msgstr "浏览(&R)..." msgid "" "Note: The following file formats may contain more than one certificate, " "certificate revocation list, or certificate trust list:" -msgstr "注意：如下格式的文件可能包含多个证书、证书吊销列表或证书信任列表：" +msgstr "注意: 如下格式的文件可能包含多个证书、证书吊销列表或证书信任列表:" #: dlls/cryptui/cryptui.rc:304 msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" @@ -2387,7 +2381,7 @@ msgstr "自动选择证书存储(&A)" #: dlls/cryptui/cryptui.rc:320 msgid "&Place all certificates in the following store:" -msgstr "将所有证书放入此存储(&P)：" +msgstr "将所有证书放入此存储(&P):" #: dlls/cryptui/cryptui.rc:330 msgid "Completing the Certificate Import Wizard" @@ -2399,7 +2393,7 @@ msgstr "您已成功完成证书导入向导。" #: dlls/cryptui/cryptui.rc:334 dlls/cryptui/cryptui.rc:448 msgid "You have specified the following settings:" -msgstr "您已指定如下设置：" +msgstr "您已指定如下设置:" #: dlls/cryptui/cryptui.rc:342 dlls/cryptui/cryptui.rc:122 #: dlls/inetcpl.cpl/inetcpl.rc:111 @@ -2408,7 +2402,7 @@ msgstr "证书" #: dlls/cryptui/cryptui.rc:345 msgid "I&ntended purpose:" -msgstr "预期用途：" +msgstr "预期用途:" #: dlls/cryptui/cryptui.rc:349 msgid "&Import..." @@ -2451,7 +2445,7 @@ msgstr "选择一个或多个在选中高级用途后要列出的用途。" #: dlls/cryptui/cryptui.rc:366 msgid "&Certificate purposes:" -msgstr "证书用途(&C)：" +msgstr "证书用途(&C):" #: dlls/cryptui/cryptui.rc:375 dlls/cryptui/cryptui.rc:386 #: dlls/cryptui/cryptui.rc:399 dlls/cryptui/cryptui.rc:409 @@ -2491,7 +2485,7 @@ msgstr "如果您选择导出私钥，将提示您创建密码以保护后页的 #: dlls/cryptui/cryptui.rc:390 msgid "Do you wish to export the private key?" -msgstr "您希望导出私钥吗？" +msgstr "您希望导出私钥吗?" #: dlls/cryptui/cryptui.rc:391 msgid "&Yes, export the private key" @@ -2503,11 +2497,11 @@ msgstr "否，不要导出私钥(&O)" #: dlls/cryptui/cryptui.rc:404 msgid "&Confirm password:" -msgstr "确认密码(&C)：" +msgstr "确认密码(&C):" #: dlls/cryptui/cryptui.rc:412 msgid "Select the format you want to use:" -msgstr "选择您希望使用的格式：" +msgstr "选择您希望使用的格式:" #: dlls/cryptui/cryptui.rc:413 msgid "&DER-encoded X.509 (*.cer)" @@ -2515,7 +2509,7 @@ msgstr "&DER 加密的 X.509 (*.cer)" #: dlls/cryptui/cryptui.rc:415 msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64 加密的 X.509 (*.cer)：" +msgstr "Ba&se64 加密的 X.509 (*.cer):" #: dlls/cryptui/cryptui.rc:417 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" @@ -2591,15 +2585,15 @@ msgstr "证书的所有预期用途均无法验证。" #: dlls/cryptui/cryptui.rc:37 msgid "This certificate is intended for the following purposes:" -msgstr "该证书的预期用途如下：" +msgstr "该证书的预期用途如下:" #: dlls/cryptui/cryptui.rc:38 msgid "Issued to: " -msgstr "颁发给：" +msgstr "颁发给: " #: dlls/cryptui/cryptui.rc:39 msgid "Issued by: " -msgstr "颁发者：" +msgstr "颁发者: " #: dlls/cryptui/cryptui.rc:40 msgid "Valid from " @@ -2684,7 +2678,7 @@ msgstr "公钥" #: dlls/cryptui/cryptui.rc:61 msgid "%1 (%2!d! bits)" -msgstr "%1（%2!d! 位）" +msgstr "%1 (%2!d! 位)" #: dlls/cryptui/cryptui.rc:62 msgid "SHA1 hash" @@ -2692,7 +2686,7 @@ msgstr "SHA1 哈希值" #: dlls/cryptui/cryptui.rc:63 msgid "Enhanced key usage (property)" -msgstr "增强密钥用途（财产）" +msgstr "增强密钥用途 (属性)" #: dlls/cryptui/cryptui.rc:64 msgid "Friendly name" @@ -2854,7 +2848,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您已不能使用此证书解密或签名消息。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:111 msgid "" @@ -2863,7 +2857,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您已不能使用这些证书解密或签名消息。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:112 msgid "" @@ -2872,7 +2866,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "您已不能使用此证书加密或校验消息。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:113 msgid "" @@ -2881,7 +2875,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "您已不能使用这些证书加密或校验消息。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:114 msgid "" @@ -2890,7 +2884,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "将不再信任由此证书颁发机构颁发的证书。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:115 msgid "" @@ -2899,7 +2893,7 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "将不再信任由这些证书颁发机构颁发的证书。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:116 msgid "" @@ -2908,7 +2902,7 @@ msgid "" "Are you sure you want to remove this trusted root certificate?" msgstr "" "将不再信任由此根证书颁发机构颁发的证书或证书颁发机构。\n" -"您确实要移除此已信任的根证书吗？" +"您确实要移除此已信任的根证书吗?" #: dlls/cryptui/cryptui.rc:117 msgid "" @@ -2917,7 +2911,7 @@ msgid "" "Are you sure you want to remove these trusted root certificates?" msgstr "" "将不再信任由这些根证书颁发机构颁发的证书或证书颁发机构。\n" -"您确实要移除这些已信任的根证书吗？" +"您确实要移除这些已信任的根证书吗?" #: dlls/cryptui/cryptui.rc:118 msgid "" @@ -2925,7 +2919,7 @@ msgid "" "Are you sure you want to remove this certificate?" msgstr "" "将不再信任由此发行商签名的软件。\n" -"您确实要移除此证书吗？" +"您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:119 msgid "" @@ -2933,15 +2927,15 @@ msgid "" "Are you sure you want to remove these certificates?" msgstr "" "将不再信任由这些发行商签名的软件。\n" -"您确实要移除这些证书吗？" +"您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:120 msgid "Are you sure you want to remove this certificate?" -msgstr "您确实要移除此证书吗？" +msgstr "您确实要移除此证书吗?" #: dlls/cryptui/cryptui.rc:121 msgid "Are you sure you want to remove these certificates?" -msgstr "您确实要移除这些证书吗？" +msgstr "您确实要移除这些证书吗?" #: dlls/cryptui/cryptui.rc:124 msgid "Ensures the identity of a remote computer" @@ -3001,7 +2995,7 @@ msgstr "指定用于保存内容的文件名称。" #: dlls/cryptui/cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "指定文件已经存在。是否替换？" +msgstr "指定文件已经存在。您要替换它吗?" #: dlls/cryptui/cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -3063,11 +3057,11 @@ msgstr "密码不一致。" #: dlls/cryptui/cryptui.rc:175 msgid "Note: The private key for this certificate could not be opened." -msgstr "注意：无法打开该证书的私钥。" +msgstr "注意: 无法打开该证书的私钥。" #: dlls/cryptui/cryptui.rc:176 msgid "Note: The private key for this certificate is not exportable." -msgstr "注意：证书的私钥不可导出。" +msgstr "注意: 证书的私钥不可导出。" #: dlls/cryptui/cryptui.rc:177 msgid "Intended Use" @@ -3456,7 +3450,7 @@ msgstr "请指定您希望在 Internet Explorer 中打开的 URL" #: dlls/ieframe/ieframe.rc:94 msgid "Open:" -msgstr "打开：" +msgstr "打开:" #: dlls/ieframe/ieframe.rc:70 msgctxt "home page" @@ -3604,7 +3598,7 @@ msgstr "使用自动代理服务器配置 (PAC) 脚本" #: dlls/inetcpl.cpl/inetcpl.rc:128 dlls/inetcpl.cpl/inetcpl.rc:132 msgid "Address:" -msgstr "地址：" +msgstr "地址:" #: dlls/inetcpl.cpl/inetcpl.rc:130 msgid "Proxy server" @@ -3616,7 +3610,7 @@ msgstr "使用代理服务器" #: dlls/inetcpl.cpl/inetcpl.rc:134 msgid "Port:" -msgstr "端口：" +msgstr "端口:" #: dlls/inetcpl.cpl/inetcpl.rc:31 msgid "Internet Settings" @@ -3628,7 +3622,7 @@ msgstr "配置 Wine Internet Explorer 以及相关设置" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " -msgstr "此区域的安全设置：" +msgstr "此区域的安全设置: " #: dlls/inetcpl.cpl/inetcpl.rc:34 msgid "Custom" @@ -3663,30 +3657,24 @@ msgid "&Disable" msgstr "停用(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "重设" +msgstr "重置(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "启用(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "编辑顶替" +msgstr "重写(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "已连接" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "语音输入设备：" +msgstr "已连接 (xinput 设备)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3930,21 +3918,19 @@ msgstr "无法在此对象上更改属性描述符中的“writable”属性为 #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "无法定义属性 '|': 对象不可扩展" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" -msgstr "无法重定义不可配置的属性“|”" +msgstr "无法重定义不可配置的属性 '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "无法更改不可写的属性“|”" +msgstr "无法更改不可写的属性 '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[object]' 不是日期对象" +msgstr "'this' 不是 Map 对象" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -4785,19 +4771,19 @@ msgstr "注册表损坏。\n" #: dlls/kernel32/winerror.mc:1068 msgid "Invalid key.\n" -msgstr "无效的键。\n" +msgstr "无效的项。\n" #: dlls/kernel32/winerror.mc:1073 msgid "Can't open registry key.\n" -msgstr "无法打开注册表键。\n" +msgstr "无法打开注册表项。\n" #: dlls/kernel32/winerror.mc:1078 msgid "Can't read registry key.\n" -msgstr "无法读取注册表键。\n" +msgstr "无法读取注册表项。\n" #: dlls/kernel32/winerror.mc:1083 msgid "Can't write registry key.\n" -msgstr "无法写入注册表键。\n" +msgstr "无法写入注册表项。\n" #: dlls/kernel32/winerror.mc:1088 msgid "Registry has been recovered.\n" @@ -4817,7 +4803,7 @@ msgstr "不是注册表文件。\n" #: dlls/kernel32/winerror.mc:1108 msgid "Key deleted.\n" -msgstr "键已删除。\n" +msgstr "注册表项已删除。\n" #: dlls/kernel32/winerror.mc:1113 msgid "No registry log space.\n" @@ -4825,11 +4811,11 @@ msgstr "注册表日志空间耗尽。\n" #: dlls/kernel32/winerror.mc:1118 msgid "Registry key has subkeys.\n" -msgstr "注册表键包含子键。\n" +msgstr "注册表项包含子项。\n" #: dlls/kernel32/winerror.mc:1123 msgid "Subkey must be volatile.\n" -msgstr "子键必须为可变。\n" +msgstr "子项必须为可变。\n" #: dlls/kernel32/winerror.mc:1128 msgid "Notify change request in progress.\n" @@ -6940,10 +6926,8 @@ msgid "Resource is not currently available.\n" msgstr "资源当前不可用。\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "类名：" +msgstr "经典蓝" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -6951,569 +6935,468 @@ msgid "Normal" msgstr "普通" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "盘符" +msgstr "信纸" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "盘符" +msgstr "小号信纸" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "表格(&T)" +msgstr "Tabloid" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Ledger" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "法律专用纸" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "状态" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "执行(&E)..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "小号" +msgstr "小号 A4" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "对开" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "四开" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "记事本" +msgstr "便笺" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "信封 #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "信封 #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "信封 #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "信封 #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "信封 #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C 型纸" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D 型纸" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E 型纸" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "信封 DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "信封 C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "信封 C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "信封 C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "信封 C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "信封 C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "信封 B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "信封 B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "信封 B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "已封装的 PKCS 7" +msgstr "信封" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "信封 Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "已封装的 PKCS 7" +msgstr "6 3/4 信封" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "美国标准复写簿" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "德国标准复写簿" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "德国法律专用复写簿" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "日语" +msgstr "日式明信片" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "邀请信封" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "盘符" +msgstr "特大信纸" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "特大法律专用纸" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "特大 Tabloid" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "其他(&X)" +msgstr "特大 A4" #: dlls/localspl/localspl.rc:88 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "Letter Transverse" -msgstr "横向" +msgstr "信纸横向" #: dlls/localspl/localspl.rc:89 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A4 Transverse" -msgstr "横向" +msgstr "A4 横向" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "特大信纸横向" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "超大 A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "超大 B" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "盘符" +msgstr "加大信纸" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "加大 A4" #: dlls/localspl/localspl.rc:95 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A5 Transverse" -msgstr "横向" +msgstr "A5 横向" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) 横向" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "其他(&X)" +msgstr "特大 A3" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "其他(&X)" +msgstr "特大 A5" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "特大 B5 (ISO)" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A3 Transverse" -msgstr "横向" +msgstr "A3 横向" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "特大 A3 横向" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "日式双层明信片" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "日式信封 Kaku #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "日式信封 Kaku #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "日式信封 Chou #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "日式信封 Chou #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "信纸旋转" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 旋转" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 旋转" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 旋转" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) 旋转" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) 旋转" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "日式明信片旋转" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "日式双层明信片旋转" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 旋转" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "日式信封 Kaku #2 旋转" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "日式信封 Kaku #3 旋转" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "日式信封 Chou #3 旋转" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "日式信封 Chou #4 旋转" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) 旋转" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "日式信纸 You #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "日式信纸 You #4 旋转" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "中国 16 开" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "中国 32 开" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "中国 32 开 (大)" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "中国 16 开旋转" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "中国 32 开旋转" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "中国 32 开 (大) 旋转" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #1 旋转" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #2 旋转" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #3 旋转" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #4 旋转" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #5 旋转" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #6 旋转" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #7 旋转" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #8 旋转" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #9 旋转" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "已封装的 PKCS 7" +msgstr "中国信封 #10 旋转" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7530,7 +7413,7 @@ msgstr "添加本地端口" #: dlls/localui/localui.rc:42 msgid "&Enter the port name to add:" -msgstr "添加本地端口名称(&E)：" +msgstr "添加本地端口名称(&E):" #: dlls/localui/localui.rc:51 msgid "Configure LPT Port" @@ -7542,7 +7425,7 @@ msgstr "超时(秒)" #: dlls/localui/localui.rc:55 msgid "&Transmission Retry:" -msgstr "重试通讯(&T)：" +msgstr "重试通讯(&T):" #: dlls/localui/localui.rc:32 msgid "'%s' is not a valid port name" @@ -7962,7 +7845,7 @@ msgstr "输入网络密码" #: dlls/mpr/mpr.rc:38 dlls/wininet/wininet.rc:51 dlls/wininet/wininet.rc:71 msgid "Please enter your username and password:" -msgstr "请输入用户名和密码：" +msgstr "请输入用户名和密码:" #: dlls/mpr/mpr.rc:39 dlls/wininet/wininet.rc:52 msgid "Proxy" @@ -7994,11 +7877,11 @@ msgstr "保存为(&S)..." #: dlls/msacm32/msacm32.rc:42 msgid "&Format:" -msgstr "格式(&F)：" +msgstr "格式(&F):" #: dlls/msacm32/msacm32.rc:47 msgid "&Attributes:" -msgstr "属性(&A)：" +msgstr "属性(&A):" #: dlls/mshtml/mshtml.rc:39 msgid "Hyperlink" @@ -8010,11 +7893,11 @@ msgstr "超链接信息" #: dlls/mshtml/mshtml.rc:43 programs/winecfg/winecfg.rc:243 msgid "&Type:" -msgstr "类型(&T)：" +msgstr "类型(&T):" #: dlls/mshtml/mshtml.rc:45 msgid "&URL:" -msgstr "网址(&U)：" +msgstr "网址(&U):" #: dlls/mshtml/mshtml.rc:34 msgid "HTML Document" @@ -8076,31 +7959,31 @@ msgid "" msgstr "" "Windows Installer %s\n" "\n" -"用法：\n" +"用法:\n" "msiexec 命令 {必要参数} [可选参数]\n" "\n" -"安装产品：\n" +"安装产品:\n" "\t/i {安装包|产品序列号} [属性]\n" "\t/package {安装包|产品序列号} [属性]\n" "\t/a package [属性]\n" -"修复安装：\n" +"修复安装:\n" "\t/f[p|o|e|d|c|a|u|m|s|v] {产品|序列号}\n" -"卸载产品：\n" +"卸载产品:\n" "\t/uninstall {产品|序列号} [属性]\n" "\t/x {产品|序列号} [属性]\n" -"宣传产品：\n" +"宣传产品:\n" "\t/j[u|m] package [/t 变形] [/g 语言代号]\n" "应用补丁\n" "\t/p 补丁包 [属性]\n" "\t/p 补丁包 /a 安装包 [属性]\n" -"以上命令的日志和用户界面修饰：\n" +"以上命令的日志和用户界面修饰:\n" "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] 日志文件\n" "\t/q{|n|b|r|f|n+|b+|b-}\n" -"注册 MSI 服务：\n" +"注册 MSI 服务:\n" "\t/y\n" -"取消注册 MSI 服务：\n" +"取消注册 MSI 服务:\n" "\t/z\n" -"显示此帮助信息：\n" +"显示此帮助信息:\n" "\t/help\n" "\t/?\n" @@ -8118,7 +8001,7 @@ msgstr "本功能的网络驱动器不存在" #: dlls/msi/msi.rc:64 msgid "feature from:" -msgstr "功能来自：" +msgstr "功能来自:" #: dlls/msi/msi.rc:65 msgid "choose which folder contains %s" @@ -8374,87 +8257,87 @@ msgstr "正在写入系统注册表值" #: dlls/msi/msi.rc:161 msgid "Free space: [1]" -msgstr "可用空间： [1]" +msgstr "可用空间: [1]" #: dlls/msi/msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "属性：[1]，签名：[2]" +msgstr "属性: [1]，签名: [2]" #: dlls/msi/msi.rc:163 msgid "File: [1]" -msgstr "文件：[1]" +msgstr "文件: [1]" #: dlls/msi/msi.rc:164 dlls/msi/msi.rc:191 msgid "Folder: [1]" -msgstr "文件夹：[1]" +msgstr "文件夹: [1]" #: dlls/msi/msi.rc:165 dlls/msi/msi.rc:194 msgid "Shortcut: [1]" -msgstr "快捷方式：[1]" +msgstr "快捷方式: [1]" #: dlls/msi/msi.rc:166 dlls/msi/msi.rc:197 dlls/msi/msi.rc:198 msgid "Service: [1]" -msgstr "服务：[1]" +msgstr "服务: [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "文件：[1]，路径：[9]，大小：[6]" +msgstr "文件: [1]，路径: [9]，大小: [6]" #: dlls/msi/msi.rc:168 msgid "Found application: [1]" -msgstr "找到应用程序：[1]" +msgstr "找到应用程序: [1]" #: dlls/msi/msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "文件：[1]，路径：[9]，大小：[6]" +msgstr "文件: [1]，路径: [9]，大小: [6]" #: dlls/msi/msi.rc:171 msgid "Service: [2]" -msgstr "服务：[2]" +msgstr "服务: [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "文件：[1]，依赖项：[2]" +msgstr "文件: [1]，依赖项: [2]" #: dlls/msi/msi.rc:173 msgid "Application: [1]" -msgstr "应用程序：[1]" +msgstr "应用程序: [1]" #: dlls/msi/msi.rc:175 dlls/msi/msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "应用程序上下文：[1]，组装名称：[2]" +msgstr "应用程序上下文: [1]，组装名称: [2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "文件：[1]，路径：[2]，大小：[3]" +msgstr "文件: [1]，路径: [2]，大小: [3]" #: dlls/msi/msi.rc:178 dlls/msi/msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" -msgstr "组件 ID：[1]，修饰符：[2]" +msgstr "组件 ID: [1]，修饰符: [2]" #: dlls/msi/msi.rc:179 dlls/msi/msi.rc:200 msgid "Feature: [1]" -msgstr "特性：[1]" +msgstr "特性: [1]" #: dlls/msi/msi.rc:180 dlls/msi/msi.rc:201 msgid "Class Id: [1]" -msgstr "类 ID：[1]" +msgstr "类 ID: [1]" #: dlls/msi/msi.rc:181 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" +msgstr "应用程序 ID: [1]{{，应用程序类型: [2]，用户: [3]，RSN: [4]}}" #: dlls/msi/msi.rc:182 dlls/msi/msi.rc:203 msgid "Extension: [1]" -msgstr "扩展名：[1]" +msgstr "扩展名: [1]" #: dlls/msi/msi.rc:183 dlls/msi/msi.rc:204 msgid "Font: [1]" -msgstr "字体：[1]" +msgstr "字体: [1]" #: dlls/msi/msi.rc:184 dlls/msi/msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "MIME 内容类型：[1]，扩展名：[2]" +msgstr "MIME 内容类型: [1]，扩展名: [2]" #: dlls/msi/msi.rc:185 dlls/msi/msi.rc:206 msgid "ProgId: [1]" @@ -8466,27 +8349,27 @@ msgstr "LibID: [1]" #: dlls/msi/msi.rc:187 dlls/msi/msi.rc:190 msgid "File: [1], Directory: [9]" -msgstr "文件：[1]，路径：[9]" +msgstr "文件: [1]，路径: [9]" #: dlls/msi/msi.rc:188 dlls/msi/msi.rc:208 msgid "Name: [1], Value: [2], Action [3]" -msgstr "名称：[1]，值：[2]，动作 [3]" +msgstr "名称: [1]，值: [2]，动作 [3]" #: dlls/msi/msi.rc:189 msgid "Application: [1], Command line: [2]" -msgstr "应用程序：[1]，命令行：[2]" +msgstr "应用程序: [1]，命令行: [2]" #: dlls/msi/msi.rc:192 dlls/msi/msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "文件：[1]，板块：[2]，键：[3]，值：［4]" +msgstr "文件: [1]，节: [2]，项: [3]，值:［4]" #: dlls/msi/msi.rc:193 msgid "Key: [1], Name: [2]" -msgstr "键：[1]，名称：[2]" +msgstr "项: [1]，名称: [2]" #: dlls/msi/msi.rc:195 dlls/msi/msi.rc:196 msgid "File: [1], Folder: [2]" -msgstr "文件：[1]，文件夹：[2]" +msgstr "文件: [1]，文件夹: [2]" #: dlls/msi/msi.rc:202 msgid "AppId: [1]{{, AppType: [2]}}" @@ -8494,11 +8377,11 @@ msgstr "AppId: [1]{{, AppType: [2]}}" #: dlls/msi/msi.rc:210 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "键：[1]，名称：[2]，值：[3]" +msgstr "项: [1]，名称: [2]，值: [3]" #: dlls/msi/msi.rc:72 msgid "{{Fatal error: }}" -msgstr "{{致命错误：}}" +msgstr "{{致命错误: }}" #: dlls/msi/msi.rc:73 msgid "{{Error [1]. }}" @@ -8519,41 +8402,41 @@ msgid "" "arguments are: [2], [3], [4]}}" msgstr "" "安装程序在安装此软件包时遇到了未预期的错误。这可能代表软件包存在问题。错误码" -"为 [1]。{{参数为：[2]，[3]，[4]}}" +"为 [1]。{{参数为: [2]，[3]，[4]}}" #: dlls/msi/msi.rc:77 msgid "{{Disk full: }}" -msgstr "{{磁盘已满：}}" +msgstr "{{磁盘已满: }}" #: dlls/msi/msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "操作 [Time]：[1]。[2]" +msgstr "操作 [Time]: [1]。[2]" #: dlls/msi/msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "消息类型：[1]，参数：[2]{, [3]}" +msgstr "消息类型: [1]，参数: [2]{，[3]}" #: dlls/msi/msi.rc:82 msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== 日志开头：[Date] [Time] ===" +msgstr "=== 日志开头: [Date] [Time] ===" #: dlls/msi/msi.rc:80 msgid "Action start [Time]: [1]." -msgstr "操作开始 [Time]：[1]。" +msgstr "操作开始 [Time]: [1]。" #: dlls/msi/msi.rc:81 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "操作结束 [Time]：[1]。返回值 [2]。" +msgstr "操作结束 [Time]: [1]。返回值 [2]。" #: dlls/msi/msi.rc:84 msgid "Please insert the disk: [2]" -msgstr "请插入磁盘：[2]" +msgstr "请插入磁盘: [2]" #: dlls/msi/msi.rc:85 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." -msgstr "找不到源文件{{(cabinet)}}：[2]。请检查文件是否存在且可被您访问。" +msgstr "找不到源文件{{(cabinet)}}: [2]。请检查文件是否存在且可被您访问。" #: dlls/msrle32/msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8573,7 +8456,7 @@ msgstr "视频压缩" #: dlls/msvfw32/msvfw32.rc:39 msgid "&Compressor:" -msgstr "压缩器(&C)：" +msgstr "压缩器(&C):" #: dlls/msvfw32/msvfw32.rc:42 msgid "Con&figure..." @@ -8585,7 +8468,7 @@ msgstr "关于(&A)" #: dlls/msvfw32/msvfw32.rc:47 msgid "Compression &Quality:" -msgstr "压缩质量(&Q)：" +msgstr "压缩质量(&Q):" #: dlls/msvfw32/msvfw32.rc:49 msgid "&Key Frame Every" @@ -9049,7 +8932,7 @@ msgstr "提供者" #: dlls/oledb32/version.rc:59 msgid "Select the data you want to connect to:" -msgstr "选择您想要连接的数据源：" +msgstr "选择您想要连接的数据源:" #: dlls/oledb32/version.rc:66 msgid "Connection" @@ -9057,11 +8940,11 @@ msgstr "连接" #: dlls/oledb32/version.rc:69 msgid "Specify the following to connect to ODBC data:" -msgstr "指定以下内容以连接到 ODBC 数据源：" +msgstr "指定以下内容以连接到 ODBC 数据源:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "1. 指定数据源：" +msgstr "1. 指定数据源:" #: dlls/oledb32/version.rc:71 msgid "Use &data source name" @@ -9073,7 +8956,7 @@ msgstr "使用连接字符串(&O)" #: dlls/oledb32/version.rc:75 msgid "&Connection string:" -msgstr "连接字符串(&C)：" +msgstr "连接字符串(&C):" #: dlls/oledb32/version.rc:77 msgid "B&uild..." @@ -9085,7 +8968,7 @@ msgstr "2. 输入服务器登录信息" #: dlls/oledb32/version.rc:79 msgid "User &name:" -msgstr "用户名(&N)：" +msgstr "用户名(&N):" #: dlls/oledb32/version.rc:83 msgid "&Blank password" @@ -9097,7 +8980,7 @@ msgstr "允许保存密码(&S)" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "3. 输入要使用的初始目录：" +msgstr "3. 输入要使用的初始目录:" #: dlls/oledb32/version.rc:87 msgid "&Test Connection" @@ -9113,15 +8996,15 @@ msgstr "网络设置" #: dlls/oledb32/version.rc:96 msgid "&Impersonation level:" -msgstr "模拟级别(&I)：" +msgstr "模拟级别(&I):" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "保护级别(&R)：" +msgstr "保护级别(&R):" #: dlls/oledb32/version.rc:101 msgid "Connect:" -msgstr "连接：" +msgstr "连接:" #: dlls/oledb32/version.rc:103 msgid "seconds." @@ -9129,7 +9012,7 @@ msgstr "秒。" #: dlls/oledb32/version.rc:104 msgid "A&ccess:" -msgstr "访问(&A)：" +msgstr "访问(&A):" #: dlls/oledb32/version.rc:110 msgid "All" @@ -9203,7 +9086,7 @@ msgstr "插入对象" #: dlls/oledlg/oledlg.rc:61 msgid "Object Type:" -msgstr "对象类型：" +msgstr "对象类型:" #: dlls/oledlg/oledlg.rc:64 dlls/oledlg/oledlg.rc:102 msgid "Result" @@ -9235,7 +9118,7 @@ msgstr "浏览..." #: dlls/oledlg/oledlg.rc:76 msgid "File:" -msgstr "文件：" +msgstr "文件:" #: dlls/oledlg/oledlg.rc:82 msgid "Paste Special" @@ -9243,7 +9126,7 @@ msgstr "特殊粘贴" #: dlls/oledlg/oledlg.rc:85 dlls/setupapi/setupapi.rc:43 msgid "Source:" -msgstr "源文件：" +msgstr "源文件:" #: dlls/oledlg/oledlg.rc:86 dlls/shdoclc/shdoclc.rc:50 #: dlls/shdoclc/shdoclc.rc:82 dlls/shdoclc/shdoclc.rc:95 @@ -9259,7 +9142,7 @@ msgstr "粘贴链接(&L)" #: dlls/oledlg/oledlg.rc:90 msgid "&As:" -msgstr "为(&A)：" +msgstr "为(&A):" #: dlls/oledlg/oledlg.rc:97 msgid "&Display As Icon" @@ -9271,14 +9154,14 @@ msgstr "改变图标(&I)..." #: dlls/oledlg/oledlg.rc:28 msgid "Insert a new %s object into your document" -msgstr "在你的文件中插入一个新的 %s 对象" +msgstr "在您的文件中插入一个新的 %s 对象" #: dlls/oledlg/oledlg.rc:29 msgid "" "Insert the contents of the file as an object into your document so that you " "may activate it using the program which created it." msgstr "" -"将文件的内容以对象的方式插入到你的文件以便你可以用创建本文件的程序来激活它。" +"将文件的内容以对象的方式插入到您的文件以便您可以用创建本文件的程序来激活它。" #: dlls/oledlg/oledlg.rc:30 dlls/shell32/shell32.rc:195 msgid "Browse" @@ -9312,20 +9195,20 @@ msgstr "对象(&O)" #: dlls/oledlg/oledlg.rc:41 msgid "Inserts the contents of the clipboard into your document as %s." -msgstr "将剪贴板的内容以 %s 插入到你的文件。" +msgstr "将剪贴板的内容以 %s 插入到您的文件。" #: dlls/oledlg/oledlg.rc:42 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s." -msgstr "将剪贴板的内容插入到你的文件以便你可以使用 %s。" +msgstr "将剪贴板的内容插入到您的文件以便您可以使用 %s。" #: dlls/oledlg/oledlg.rc:43 msgid "" "Inserts the contents of the clipboard into your document so that you can " "activate it using %s. It will be displayed as an icon." msgstr "" -"将剪贴板的内容插入到你的文件，你可以用 %s 激活它。插入的内容会显示为图标。" +"将剪贴板的内容插入到您的文件，您可以用 %s 激活它。插入的内容会显示为图标。" #: dlls/oledlg/oledlg.rc:44 msgid "" @@ -9333,8 +9216,8 @@ msgid "" "linked to the source file so that changes to the file will be reflected in " "your document." msgstr "" -"将剪贴板的内容以 %s 插入到你的文件。数据是链接到源文件的, 对源文件的任何改动" -"都会反映到反映到你的文档中。" +"将剪贴板的内容以 %s 插入到您的文件。数据是链接到源文件的, 对源文件的任何改动" +"都会反映到反映到您的文档中。" #: dlls/oledlg/oledlg.rc:45 msgid "" @@ -9342,7 +9225,7 @@ msgid "" "is linked to the source file so that changes to the file will be reflected " "in your document." msgstr "" -"插入剪贴板中的图片。图片是链接到源文件的，对源文件的任何改动都会反映到你的文" +"插入剪贴板中的图片。图片是链接到源文件的，对源文件的任何改动都会反映到您的文" "档中。" #: dlls/oledlg/oledlg.rc:46 @@ -9352,11 +9235,11 @@ msgid "" "be reflected in your document." msgstr "" "插入指向剪贴板中文件的快捷方式。快捷方式是链接到源文件的，对源文件的任何改动" -"都会反映到你的文档中。" +"都会反映到您的文档中。" #: dlls/oledlg/oledlg.rc:47 msgid "Inserts the contents of the clipboard into your document." -msgstr "将剪贴板的内容插入到你的文件。" +msgstr "将剪贴板的内容插入到您的文件。" #: dlls/oledlg/oledlg.rc:48 programs/regedit/regedit.rc:430 msgid "Unknown Type" @@ -9434,7 +9317,7 @@ msgstr "复制文件..." #: dlls/setupapi/setupapi.rc:45 msgid "Destination:" -msgstr "目标文件：" +msgstr "目标文件:" #: dlls/setupapi/setupapi.rc:52 msgid "Files Needed" @@ -9448,11 +9331,11 @@ msgstr "插入厂商的安装磁盘，然后确定下面选择了正确的驱动 #: dlls/setupapi/setupapi.rc:57 msgid "Copy manufacturer's files from:" -msgstr "从此处复制厂商文件：" +msgstr "从此处复制厂商文件:" #: dlls/setupapi/setupapi.rc:31 msgid "The file '%1' on %2 is needed" -msgstr "需要 %2 上的文件“%1”" +msgstr "需要 %2 上的文件 '%1'" #: dlls/setupapi/setupapi.rc:32 programs/ipconfig/ipconfig.rc:34 msgid "Unknown" @@ -9460,7 +9343,7 @@ msgstr "未知" #: dlls/setupapi/setupapi.rc:33 msgid "Copy files from:" -msgstr "文件复制来源：" +msgstr "文件复制来源:" #: dlls/setupapi/setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." @@ -9860,7 +9743,7 @@ msgstr "选择文件夹" #: dlls/shell32/shell32.rc:291 msgid "Folder:" -msgstr "文件夹：" +msgstr "文件夹:" #: dlls/shell32/shell32.rc:297 msgid "&Make New Folder" @@ -9888,7 +9771,7 @@ msgstr "运行于 %s" #: dlls/shell32/shell32.rc:327 msgid "Wine was brought to you by:" -msgstr "Wine 开发人员：" +msgstr "Wine 开发者:" #: dlls/shell32/shell32.rc:332 msgid "Run" @@ -9902,7 +9785,7 @@ msgstr "输入程序，目录，文件或者Internet资源名，Wine将为您打 #: dlls/shell32/shell32.rc:337 msgid "&Open:" -msgstr "打开(&O)：" +msgstr "打开(&O):" #: dlls/shell32/shell32.rc:341 programs/progman/progman.rc:182 #: programs/progman/progman.rc:201 programs/progman/progman.rc:218 @@ -9912,25 +9795,25 @@ msgstr "浏览(&B)..." #: dlls/shell32/shell32.rc:353 dlls/shell32/shell32.rc:382 msgid "File type:" -msgstr "文件类型：" +msgstr "文件类型:" #: dlls/shell32/shell32.rc:357 dlls/shell32/shell32.rc:390 #: dlls/urlmon/urlmon.rc:37 programs/explorer/explorer.rc:33 msgid "Location:" -msgstr "位置：" +msgstr "位置:" #: dlls/shell32/shell32.rc:359 dlls/shell32/shell32.rc:392 #: programs/winefile/winefile.rc:169 msgid "Size:" -msgstr "大小：" +msgstr "大小:" #: dlls/shell32/shell32.rc:363 dlls/shell32/shell32.rc:396 msgid "Creation date:" -msgstr "创建日期：" +msgstr "创建日期:" #: dlls/shell32/shell32.rc:367 dlls/shell32/shell32.rc:404 msgid "Attributes:" -msgstr "属性：" +msgstr "属性:" #: dlls/shell32/shell32.rc:369 dlls/shell32/shell32.rc:406 #: programs/winefile/winefile.rc:173 @@ -9944,7 +9827,7 @@ msgstr "存档(&A)" #: dlls/shell32/shell32.rc:384 msgid "Open with:" -msgstr "打开方式：" +msgstr "打开方式:" #: dlls/shell32/shell32.rc:387 msgid "&Change..." @@ -9952,11 +9835,11 @@ msgstr "更改(&C)..." #: dlls/shell32/shell32.rc:398 msgid "Last modified:" -msgstr "最近修改：" +msgstr "最近修改:" #: dlls/shell32/shell32.rc:400 msgid "Last accessed:" -msgstr "最近访问：" +msgstr "最近访问:" #: dlls/shell32/shell32.rc:138 dlls/shell32/shell32.rc:142 #: programs/winefile/winefile.rc:107 @@ -10154,7 +10037,7 @@ msgstr "下载" #: dlls/shell32/shell32.rc:167 msgid "Unable to create new Folder: Permission denied." -msgstr "无法创建新文件夹：拒绝访问。" +msgstr "无法创建新文件夹: 拒绝访问。" #: dlls/shell32/shell32.rc:168 msgid "Error during creation of a new folder" @@ -10263,7 +10146,7 @@ msgid "" msgstr "" "文件 %1 已经存在。\n" "\n" -"是否替换？" +"您要替换它吗?" #: dlls/shell32/shell32.rc:248 msgid "" @@ -10273,7 +10156,7 @@ msgid "" msgstr "" "文件夹 %1 已经存在。\n" "\n" -"是否替换？" +"您要替换它吗?" #: dlls/shell32/shell32.rc:249 msgid "Confirm overwrite" @@ -10357,7 +10240,7 @@ msgstr "中国夏令时" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) 北京，重庆，香港，乌鲁木齐" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10369,7 +10252,7 @@ msgstr "北亚夏令时" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) 雅茨克" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" @@ -10381,17 +10264,15 @@ msgstr "格鲁吉亚夏令时" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) 第比利斯" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:395 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "协调世界时" +msgstr "(UTC+12:00) 协调世界时+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" @@ -10403,7 +10284,7 @@ msgstr "尼泊尔夏令时" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) 加德满都" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" @@ -10415,7 +10296,7 @@ msgstr "佛得角夏令时" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) 佛得角群岛" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" @@ -10427,7 +10308,7 @@ msgstr "海地夏令时" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) 海地" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" @@ -10439,7 +10320,7 @@ msgstr "中欧夏令时" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) 萨拉热窝，斯科普里，华沙，萨格勒布" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10451,33 +10332,27 @@ msgstr "摩洛哥夏令时" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) 卡萨布兰卡" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:404 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "协调世界时" +msgstr "(UTC-08:00) 协调世界时-8" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "大西洋标准时间" +msgstr "阿尔泰标准时间" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "大西洋夏令时" +msgstr "阿尔泰夏令时" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) 巴尔瑙尔，戈尔诺-阿尔泰斯克" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" @@ -10489,7 +10364,7 @@ msgstr "中欧夏令时" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) 贝尔格莱德，布拉迪斯拉发，布达佩斯，卢布尔雅那，布拉格" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10501,7 +10376,7 @@ msgstr "伊朗夏令时" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) 德黑兰" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" @@ -10512,26 +10387,20 @@ msgid "Saint Pierre Daylight Time" msgstr "圣皮埃尔夏令时" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "圣皮埃尔标准时间" +msgstr "(UTC-03:00) 圣皮埃尔和密克隆" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "萨摩亚标准时间" +msgstr "圣多美标准时间" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "萨摩亚夏令时" +msgstr "圣多美夏令时" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) 圣多美" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" @@ -10543,7 +10412,7 @@ msgstr "纳米比亚夏令时" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) 温得和克" #: dlls/tzres/tzres.rc:369 msgid "Tonga Standard Time" @@ -10555,19 +10424,19 @@ msgstr "汤加夏令时" #: dlls/tzres/tzres.rc:371 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) 努库阿洛法" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" -msgstr "山地标准时间（墨西哥）" +msgstr "山地标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:241 msgid "Mountain Daylight Time (Mexico)" -msgstr "山地夏令时（墨西哥）" +msgstr "山地夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) 奇瓦瓦，拉巴斯，马萨特兰" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" @@ -10579,23 +10448,19 @@ msgstr "格林尼治夏令时" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) 柏林，爱丁堡，里斯本，伦敦" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "South Sudan Standard Time" -msgstr "约旦标准时间" +msgstr "南苏丹标准时间" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "约旦夏令时" +msgstr "南苏丹夏令时" #: dlls/tzres/tzres.rc:344 msgid "(UTC+02:00) Juba" -msgstr "" +msgstr "(UTC+02:00) 朱巴" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -10607,7 +10472,7 @@ msgstr "中亚夏令时" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) 阿斯塔纳" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" @@ -10619,7 +10484,7 @@ msgstr "豪勋爵夏令时" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) 豪勋爵岛" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" @@ -10631,17 +10496,15 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) 巴格达" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:398 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "协调世界时" +msgstr "(UTC+13:00) 协调世界时+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" @@ -10653,7 +10516,7 @@ msgstr "马加丹夏令时" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) 马加丹" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" @@ -10665,23 +10528,19 @@ msgstr "纽芬兰夏令时" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) 纽芬兰" #: dlls/tzres/tzres.rc:348 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "约旦标准时间" +msgstr "苏丹标准时间" #: dlls/tzres/tzres.rc:349 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "约旦夏令时" +msgstr "苏丹夏令时" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) 喀土穆" #: dlls/tzres/tzres.rc:438 msgid "West Pacific Standard Time" @@ -10693,7 +10552,7 @@ msgstr "西太平洋夏令时" #: dlls/tzres/tzres.rc:440 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) 关岛，莫尔兹比港" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10705,7 +10564,7 @@ msgstr "太平洋夏令时" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) 太平洋时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" @@ -10717,7 +10576,7 @@ msgstr "阿塞拜疆夏令时" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) 巴库" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" @@ -10729,7 +10588,7 @@ msgstr "麦哲伦夏令时" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) 蓬塔阿雷纳斯" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" @@ -10741,7 +10600,7 @@ msgstr "萨摩亚夏令时" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) 萨摩亚" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" @@ -10753,19 +10612,19 @@ msgstr "加里宁格勒夏令时" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) 加里宁格勒" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" -msgstr "太平洋标准时间（墨西哥）" +msgstr "太平洋标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:283 msgid "Pacific Daylight Time (Mexico)" -msgstr "太平洋夏令时（墨西哥）" +msgstr "太平洋夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) 下加利福尼亚" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" @@ -10777,7 +10636,7 @@ msgstr "中东夏令时" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) 贝鲁特" #: dlls/tzres/tzres.rc:363 msgid "Tokyo Standard Time" @@ -10789,7 +10648,7 @@ msgstr "东京夏令时" #: dlls/tzres/tzres.rc:365 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) 大阪，札幌，东京" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10801,7 +10660,7 @@ msgstr "莱恩群岛夏令时" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) 圣诞岛" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" @@ -10813,7 +10672,7 @@ msgstr "古巴夏令时" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) 哈瓦拉" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" @@ -10825,7 +10684,7 @@ msgstr "约旦夏令时" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) 安曼" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" @@ -10837,31 +10696,27 @@ msgstr "中部夏令时" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) 中部时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" -msgstr "" +msgstr "俄罗斯时区 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) 伊热夫斯克，萨马拉" #: dlls/tzres/tzres.rc:417 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "汤加标准时间" +msgstr "伏尔加格勒标准时间" #: dlls/tzres/tzres.rc:418 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "汤加夏令时" +msgstr "伏尔加格勒夏令时" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) 伏尔加格勒" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -10873,7 +10728,7 @@ msgstr "亚速尔群岛夏令时" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) 亚速尔群岛" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" @@ -10885,17 +10740,15 @@ msgstr "北亚东部夏令时" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) 伊尔库茨克" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:410 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "协调世界时" +msgstr "(UTC-11:00) 协调世界时-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" @@ -10907,23 +10760,19 @@ msgstr "阿根廷夏令时" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) 布宜诺斯艾利斯市" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "土耳其标准时间" +msgstr "特克斯和凯科斯群岛标准时间" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "土耳其夏令时" +msgstr "特克斯和凯科斯群岛夏令时" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) 特克斯和凯科斯群岛" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -10935,7 +10784,7 @@ msgstr "马克萨斯夏令时" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) 马克萨斯群岛" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" @@ -10947,17 +10796,15 @@ msgstr "缅甸夏令时" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) 仰光" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "Coordinated Universal Time" msgstr "协调世界时" #: dlls/tzres/tzres.rc:392 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "协调世界时" +msgstr "(UTC) 协调世界时" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" @@ -10969,7 +10816,7 @@ msgstr "印度夏令时" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) 马德拉斯，加尔各答，孟买，新德里" #: dlls/tzres/tzres.rc:180 msgid "GTB Standard Time" @@ -10981,7 +10828,7 @@ msgstr "GTB 夏令时" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) 雅典，布加勒斯特" #: dlls/tzres/tzres.rc:375 msgid "Turkey Standard Time" @@ -10993,23 +10840,19 @@ msgstr "土耳其夏令时" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) 伊斯坦布尔" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "阿拉伯标准时间" +msgstr "阿斯特拉罕标准时间" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "阿拉伯夏令时" +msgstr "阿斯特拉罕夏令时" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) 阿斯特拉罕，乌里扬诺夫斯克" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -11021,7 +10864,7 @@ msgstr "斐济夏令时" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) 斐济" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" @@ -11033,23 +10876,19 @@ msgstr "加拿大中部夏令时" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) 萨斯喀彻温省" #: dlls/tzres/tzres.rc:444 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "雅库次克标准时间" +msgstr "育空标准时间" #: dlls/tzres/tzres.rc:445 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "雅库次克夏令时" +msgstr "育空夏令时" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) 育空" #: dlls/tzres/tzres.rc:354 msgid "Taipei Standard Time" @@ -11061,7 +10900,7 @@ msgstr "台北夏令时" #: dlls/tzres/tzres.rc:356 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) 台北" #: dlls/tzres/tzres.rc:426 msgid "W. Europe Standard Time" @@ -11073,7 +10912,7 @@ msgstr "西欧夏令时" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) 阿姆斯特丹，柏林，伯尔尼，罗马，斯德哥尔摩，维也纳" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" @@ -11085,7 +10924,7 @@ msgstr "蒙得维的亚夏令时" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) 蒙得维的亚" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" @@ -11097,23 +10936,19 @@ msgstr "巴基斯坦夏令时" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) 伊斯兰堡，卡拉奇" #: dlls/tzres/tzres.rc:366 -#, fuzzy -#| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "东京标准时间" +msgstr "托木斯克标准时间" #: dlls/tzres/tzres.rc:367 -#, fuzzy -#| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "东京夏令时" +msgstr "托木斯克夏令时" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) 托木斯克" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11125,7 +10960,7 @@ msgstr "高加索夏令时" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) 埃里温" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11137,7 +10972,7 @@ msgstr "澳大利亚东部夏令时" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) 堪培拉，墨尔本，悉尼" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" @@ -11149,7 +10984,7 @@ msgstr "中北亚夏令时" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) 新西伯利亚" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" @@ -11161,67 +10996,55 @@ msgstr "东部夏令时" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) 东部时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:372 -#, fuzzy -#| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "塔斯马尼亚标准时间" +msgstr "外贝加尔标准时间" #: dlls/tzres/tzres.rc:373 -#, fuzzy -#| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "塔斯马尼亚夏令时" +msgstr "外贝加尔夏令时" #: dlls/tzres/tzres.rc:374 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) 赤塔" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "西欧标准时间" +msgstr "东欧标准时间" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "西欧夏令时" +msgstr "东欧夏令时" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) 基希讷乌" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" -msgstr "中部标准时间（墨西哥）" +msgstr "中部标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:121 msgid "Central Daylight Time (Mexico)" -msgstr "中部夏令时（墨西哥）" +msgstr "中部夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) 瓜达拉哈拉，墨西哥城，蒙特雷" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "萨摩亚标准时间" +msgstr "萨拉托夫标准时间" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "萨摩亚夏令时" +msgstr "萨拉托夫夏令时" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) 萨拉托夫" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" @@ -11233,7 +11056,7 @@ msgstr "大西洋夏令时" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) 大西洋时间 (加拿大)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" @@ -11245,7 +11068,7 @@ msgstr "山地夏令时" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) 山地时间 (美国和加拿大)" #: dlls/tzres/tzres.rc:384 msgid "US Eastern Standard Time" @@ -11257,23 +11080,19 @@ msgstr "美国东部夏令时" #: dlls/tzres/tzres.rc:386 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) 印第安那 (东部)" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "阿拉斯加标准时间" +msgstr "萨哈林加标准时间" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "阿拉斯加夏令时" +msgstr "萨哈林夏令时" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) 萨哈林" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" @@ -11285,7 +11104,7 @@ msgstr "朝鲜夏令时" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) 平壤" #: dlls/tzres/tzres.rc:357 msgid "Tasmania Standard Time" @@ -11297,7 +11116,7 @@ msgstr "塔斯马尼亚夏令时" #: dlls/tzres/tzres.rc:359 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) 霍巴特" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" @@ -11309,17 +11128,15 @@ msgstr "中美洲夏令时" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) 中美洲" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:401 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "协调世界时" +msgstr "(UTC-02:00) 协调世界时-02" #: dlls/tzres/tzres.rc:387 msgid "US Mountain Standard Time" @@ -11331,7 +11148,7 @@ msgstr "美国山地夏令时" #: dlls/tzres/tzres.rc:389 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) 亚利桑那" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" @@ -11343,7 +11160,7 @@ msgstr "南非夏令时" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) 哈拉雷，比勒陀利亚" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" @@ -11355,17 +11172,15 @@ msgstr "澳大利亚中部夏令时" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) 阿德莱德" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:407 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "协调世界时" +msgstr "(UTC-09:00) 协调世界时-09" #: dlls/tzres/tzres.rc:345 msgid "Sri Lanka Standard Time" @@ -11377,7 +11192,7 @@ msgstr "斯里兰卡夏令时" #: dlls/tzres/tzres.rc:347 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) 斯里加亚渥登普拉" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" @@ -11389,7 +11204,7 @@ msgstr "阿富汗夏令时" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) 喀布尔" #: dlls/tzres/tzres.rc:441 msgid "Yakutsk Standard Time" @@ -11401,7 +11216,7 @@ msgstr "雅库次克夏令时" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) 雅库茨克" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" @@ -11413,7 +11228,7 @@ msgstr "南美东部夏令时" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) 卡宴，福塔雷萨" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" @@ -11425,7 +11240,7 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) 科威特，利雅得" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" @@ -11437,7 +11252,7 @@ msgstr "阿拉伯夏令时" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) 阿布扎比，马斯喀特" #: dlls/tzres/tzres.rc:360 msgid "Tocantins Standard Time" @@ -11449,7 +11264,7 @@ msgstr "托坎廷斯夏令时" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) 阿拉瓜伊纳" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" @@ -11461,7 +11276,7 @@ msgstr "俄罗斯夏令时" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) 莫斯科，圣彼得堡" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" @@ -11473,7 +11288,7 @@ msgstr "澳大利亚中西部夏令时" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) 尤克拉" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" @@ -11485,7 +11300,7 @@ msgstr "罗曼夏令时" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) 布鲁塞尔，哥本哈根，马德里，巴黎" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" @@ -11497,31 +11312,27 @@ msgstr "叶卡捷琳堡夏令时" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) 叶卡特琳堡" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "俄罗斯时区 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) 阿纳德尔，彼得罗巴甫洛夫斯克-堪察加" #: dlls/tzres/tzres.rc:435 -#, fuzzy -#| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "西亚标准时间" +msgstr "西岸标准时间" #: dlls/tzres/tzres.rc:436 -#, fuzzy -#| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "西亚夏令时" +msgstr "西岸夏令时" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) 加沙，希伯仑" #: dlls/tzres/tzres.rc:351 msgid "Syria Standard Time" @@ -11533,7 +11344,7 @@ msgstr "叙利亚夏令时" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) 大马士革" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" @@ -11545,7 +11356,7 @@ msgstr "澳大利亚中部夏令时" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) 达尔文" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" @@ -11557,7 +11368,7 @@ msgstr "格林威治夏令时" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) 蒙罗维亚，雷克雅未克" #: dlls/tzres/tzres.rc:381 msgid "Ulaanbaatar Standard Time" @@ -11569,23 +11380,19 @@ msgstr "乌兰巴托夏令时" #: dlls/tzres/tzres.rc:383 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) 乌兰巴托" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "摩洛哥标准时间" +msgstr "诺福克标准时间" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "摩洛哥夏令时" +msgstr "诺福克夏令时" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) 诺福克" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" @@ -11597,7 +11404,7 @@ msgstr "以色列夏令时" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) 耶路撒冷" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" @@ -11609,7 +11416,7 @@ msgstr "孟加拉夏令时" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) 达卡" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" @@ -11621,7 +11428,7 @@ msgstr "南美太平洋夏令时" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) 波哥大，利马，基多，里奥布朗库" #: dlls/tzres/tzres.rc:432 msgid "West Asia Standard Time" @@ -11633,7 +11440,7 @@ msgstr "西亚夏令时" #: dlls/tzres/tzres.rc:434 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) 阿什哈巴德，塔什干" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" @@ -11645,7 +11452,7 @@ msgstr "阿拉斯加夏令时" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) 阿拉斯加" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" @@ -11657,7 +11464,7 @@ msgstr "巴拉圭夏令时" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) 亚松森" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" @@ -11669,7 +11476,7 @@ msgstr "日期变更线夏令时" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) 国际日期变更线西" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" @@ -11681,7 +11488,7 @@ msgstr "利比亚夏令时" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) 的黎波里" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" @@ -11693,7 +11500,7 @@ msgstr "巴伊亚夏令时" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) 萨尔瓦多" #: dlls/tzres/tzres.rc:411 msgid "Venezuela Standard Time" @@ -11705,7 +11512,7 @@ msgstr "委内瑞拉夏令时" #: dlls/tzres/tzres.rc:413 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) 加拉加斯" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" @@ -11717,7 +11524,7 @@ msgstr "布干维尔夏令时" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) 布干维尔岛" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" @@ -11729,7 +11536,7 @@ msgstr "夏威夷夏令时" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) 夏威夷" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" @@ -11741,39 +11548,31 @@ msgstr "东南亚夏令时" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) 曼谷，河内，雅加达" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "约旦标准时间" +msgstr "克孜洛尔达标准时间" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "约旦夏令时" +msgstr "克孜洛尔达夏令时" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) 克孜洛尔达" #: dlls/tzres/tzres.rc:429 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "汤加标准时间" +msgstr "西蒙古标准时间" #: dlls/tzres/tzres.rc:430 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "汤加夏令时" +msgstr "西蒙古夏令时" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) 科布多" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" @@ -11785,7 +11584,7 @@ msgstr "新西兰夏令时" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) 奥克兰，惠灵顿" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" @@ -11797,23 +11596,19 @@ msgstr "阿留申夏令时" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) 阿留申群岛" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "雅库次克标准时间" +msgstr "鄂木斯克标准时间" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "雅库次克夏令时" +msgstr "鄂木斯克克夏令时" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) 鄂木斯克" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" @@ -11825,7 +11620,7 @@ msgstr "巴西中部夏令时" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) 库亚巴" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" @@ -11837,7 +11632,7 @@ msgstr "白罗斯夏令时" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) 明斯克" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" @@ -11849,7 +11644,7 @@ msgstr "南美西部夏令时" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) 乔治敦，拉巴斯，马瑙斯，圣胡安" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" @@ -11861,7 +11656,7 @@ msgstr "格陵兰夏令时" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) 格陵兰" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" @@ -11873,15 +11668,15 @@ msgstr "复活节岛夏令时" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) 复活节岛" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" -msgstr "" +msgstr "俄罗斯时区 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) 乔库尔达赫" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" @@ -11893,19 +11688,19 @@ msgstr "埃及夏令时" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) 开罗" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" -msgstr "东部标准时间（墨西哥）" +msgstr "东部标准时间 (墨西哥)" #: dlls/tzres/tzres.rc:154 msgid "Eastern Daylight Time (Mexico)" -msgstr "东部夏令时（墨西哥）" +msgstr "东部夏令时 (墨西哥)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) 切图马尔" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" @@ -11917,19 +11712,19 @@ msgstr "毛里求斯夏令时" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) 路易港" #: dlls/tzres/tzres.rc:414 msgid "Vladivostok Standard Time" -msgstr "符拉迪沃斯托克标准时间" +msgstr "海参崴标准时间" #: dlls/tzres/tzres.rc:415 msgid "Vladivostok Daylight Time" -msgstr "符拉迪沃斯托克夏令时" +msgstr "海参崴夏令时" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) 海参崴" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" @@ -11941,7 +11736,7 @@ msgstr "新加坡夏令时" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) 吉隆坡，新加坡" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" @@ -11953,7 +11748,7 @@ msgstr "韩国夏令时" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) 首尔" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" @@ -11965,7 +11760,7 @@ msgstr "查塔姆夏令时" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) 查塔姆群岛" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" @@ -11977,7 +11772,7 @@ msgstr "东非夏令时" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) 奈洛比" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" @@ -11989,7 +11784,7 @@ msgstr "FLE 夏令时" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) 赫尔辛基，基辅，里加，索菲亚，塔林，维尔纽斯" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" @@ -12001,7 +11796,7 @@ msgstr "东南美洲夏令时" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) 巴西利亚" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" @@ -12013,7 +11808,7 @@ msgstr "中太平洋夏令时" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) 所罗门群岛，新喀里多尼亚" #: dlls/tzres/tzres.rc:423 msgid "W. Central Africa Standard Time" @@ -12025,7 +11820,7 @@ msgstr "西中非夏令时" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) 中非西部" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" @@ -12037,7 +11832,7 @@ msgstr "太平洋南美夏令时" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) 圣地亚哥" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" @@ -12049,7 +11844,7 @@ msgstr "澳大利亚东部夏令时" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) 布里斯班" #: dlls/tzres/tzres.rc:420 msgid "W. Australia Standard Time" @@ -12061,7 +11856,7 @@ msgstr "澳大利亚西部夏令时" #: dlls/tzres/tzres.rc:422 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) 珀斯" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -12069,7 +11864,7 @@ msgstr "安全警告" #: dlls/urlmon/urlmon.rc:35 msgid "Do you want to install this software?" -msgstr "是否安装该软件？" +msgstr "您是否要安装该软件?" #: dlls/urlmon/urlmon.rc:39 msgid "Don't install" @@ -12085,7 +11880,7 @@ msgstr "" #: dlls/urlmon/urlmon.rc:51 msgid "Installation of component failed: %08x" -msgstr "安装组件失败：%08x" +msgstr "安装组件失败: %08x" #: dlls/urlmon/urlmon.rc:52 msgid "Install (%d)" @@ -12314,11 +12109,11 @@ msgstr "前置全部窗口" #: dlls/wineps.drv/wineps.rc:31 msgid "Paper Si&ze:" -msgstr "纸张大小(&Z)：" +msgstr "纸张大小(&Z):" #: dlls/wineps.drv/wineps.rc:39 msgid "Duplex:" -msgstr "双面：" +msgstr "双面:" #: dlls/wineps.drv/wineps.rc:50 msgid "Setup" @@ -12342,7 +12137,7 @@ msgstr "此站点的证书有问题。" #: dlls/wininet/wininet.rc:93 msgid "Do you want to continue anyway?" -msgstr "还是要继续吗？" +msgstr "您无论如何还是要继续吗?" #: dlls/wininet/wininet.rc:28 msgid "LAN Connection" @@ -12439,7 +12234,7 @@ msgstr "从服务器接收的 SSL 证书日期无效。该证书已过期。\n" #: dlls/wininet/winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "SSL 证书一般名称（域名栏目）不正确。\n" +msgstr "SSL 证书公用名 (主机名字段) 不正确。\n" #: dlls/winmm/winmm.rc:32 msgid "The specified command was carried out." @@ -12469,7 +12264,7 @@ msgstr "指定的设备句柄无效。" #: dlls/winmm/winmm.rc:38 msgid "There is no driver installed on your system!" -msgstr "你的系统上没有安装任何驱动程序!" +msgstr "您的系统上没有安装任何驱动程序!" #: dlls/winmm/winmm.rc:39 dlls/winmm/winmm.rc:65 msgid "" @@ -12626,7 +12421,7 @@ msgstr "指定的命令需要一个参数。请提供一个参数。" #: dlls/winmm/winmm.rc:75 msgid "The MCI device you are using does not support the specified command." -msgstr "你正在使用的 MCI 设备不支持指定的命令。" +msgstr "您正在使用的 MCI 设备不支持指定的命令。" #: dlls/winmm/winmm.rc:76 msgid "" @@ -12649,7 +12444,7 @@ msgstr "设备驱动程序出现了问题。该驱动程序已经关闭。无法 #: dlls/winmm/winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." -msgstr "指定的命令无法使用“all”作为设备名称。" +msgstr "指定的命令无法使用 'all' 作为设备名称。" #: dlls/winmm/winmm.rc:81 msgid "" @@ -12957,7 +12752,7 @@ msgstr "打印到文件" #: dlls/winspool.drv/winspool.rc:40 msgid "&Output File Name:" -msgstr "输出文件名(&O)：" +msgstr "输出文件名(&O):" #: dlls/winspool.drv/winspool.rc:31 msgid "The output file already exists. Click OK to overwrite." @@ -13217,7 +13012,7 @@ msgstr "" #: programs/attrib/attrib.rc:31 programs/cmd/cmd.rc:376 msgid "%1: File Not Found\n" -msgstr "%1：找不到文件\n" +msgstr "%1: 找不到文件\n" #: programs/attrib/attrib.rc:50 msgid "" @@ -13263,10 +13058,8 @@ msgid "Active code page: %1!u!\n" msgstr "" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "无效消息。\n" +msgstr "无效代码页\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13401,7 +13194,7 @@ msgid "" msgstr "" "FOR 用于逐一执行用于一组文件的命令。\n" "\n" -"用法：FOR %变量 IN（命令组）DO 命令\n" +"用法: FOR %变量 IN (命令组) DO 命令\n" "\n" "在批处理文件中使用 FOR 时必须将 % 符号写两次。\n" @@ -13447,9 +13240,9 @@ msgid "" msgstr "" "IF 用于根据条件执行命令。\n" "\n" -"语法：\tIF [NOT] EXIST 文件名命令\n" -"\tIF [NOT] 字符串1==字符串2 命令\n" -"\tIF [NOT] ERRORLEVEL 序号命令\n" +"语法: IF [NOT] EXIST 文件名命令\n" +" IF [NOT] 字符串1==字符串2 命令\n" +" IF [NOT] ERRORLEVEL 序号命令\n" "\n" "在命令的第二种用法中，字符串 1 和字符串 2 必须用双引号包住。比较条件\n" "非大小写敏感。\n" @@ -13464,7 +13257,7 @@ msgid "" msgstr "" "LABEL 用于设置磁盘卷标。\n" "\n" -"语法：LABEL [drive:]\n" +"语法: LABEL [drive:]\n" "该命令将询问指定驱动器的新卷标。\n" "您可以使用 VOL 命令显示磁盘卷标。\n" @@ -13508,7 +13301,7 @@ msgstr "" "输入 PATH 将显示当前的 PATH 设置（默认从注册表读取）。在 PATH 后附加\n" "新值以改变设置。\n" "\n" -"也可以使用 PATH 环境变量来编辑 PATH 值，例如：\n" +"也可以使用 PATH 环境变量来编辑 PATH 值，例如:\n" "PATH %PATH%;c:\\temp\n" #: programs/cmd/cmd.rc:148 @@ -13550,7 +13343,7 @@ msgstr "" "PROMPT 命令后跟随的字符串（包括紧随其后的空格）将在 cmd 等待输入时\n" "在行头显示。\n" "\n" -"如下字符串带有特殊含义，如下：\n" +"如下字符串带有特殊含义，如下:\n" "\n" "$$ 美金符号 $_ 换行 $b 管道符号 (|)\n" "$d 当前日期 $e 转义 $g > 符号\n" @@ -13610,7 +13403,7 @@ msgstr "" "\n" "SET 不带参数使用可用于显示当前所有的环境变量。\n" "\n" -"传教或修改环境变量的语法如下：\n" +"传教或修改环境变量的语法如下:\n" "\n" "SET <变量>=<值>\n" "\n" @@ -13660,11 +13453,11 @@ msgid "" "/? Display this help and exit.\n" msgstr "" "启动程序，或用一般用于带有某个后缀的程序打开文档。\n" -"用法：\n" +"用法:\n" "start [选项] 程序文件名 [...]\n" "start [选项] 文档文件名\n" "\n" -"选项：\n" +"选项:\n" "“标题”\t设置子窗口的标题。\n" "/d 目录\t在指定目录启动程序。\n" "/b\t\t不要为程序创建新控制台。\n" @@ -13711,7 +13504,7 @@ msgid "" "\n" "The verify flag has no function in Wine.\n" msgstr "" -"VERIFY 用于设置、清除或测试校验旗标。有效形式如下：\n" +"VERIFY 用于设置、清除或测试校验旗标。有效形式如下:\n" "\n" "VERIFY ON\t设置此旗标。\n" "VERIFY OFF\t清除此旗标。\n" @@ -13770,7 +13563,7 @@ msgid "" msgstr "" "ASSOC 显示或更改文件扩展名所关联的文件类型。\n" "\n" -"语法：ASSOC [.扩展名[=[文件类型]]]\n" +"语法: ASSOC [.扩展名[=[文件类型]]]\n" "\n" "不带参数运行 ASSOC 将显示当前的文件类型关联。\n" "如使用文件扩展名作为参数，将显示当前扩展名的关联信息。\n" @@ -13791,7 +13584,7 @@ msgid "" msgstr "" "FTYPE 显示或更改与文件类型关联的打开命令。\n" "\n" -"语法：FTYPE [文件类型[=[打开命令]]]\n" +"语法: FTYPE [文件类型[=[打开命令]]]\n" "\n" "如不带任何参数运行，该命令将显示已定义启动命令字符串的文件类型。\n" "如使用文件类型作为参数，该命令将显示关联于此文件类型的启动命令（如果存" @@ -13826,9 +13619,9 @@ msgid "" msgstr "" "创建符号链接。\n" "\n" -"语法：MKLINK [options] link_name target\n" +"语法: MKLINK [options] link_name target\n" "\n" -"选项：\n" +"选项: \n" "/d 创建目录符号链接。\n" "/h 创建硬链接。\n" "/j 创建目录结。\n" @@ -13883,7 +13676,7 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"CMD 的内建命令如下：\n" +"CMD 的内建命令如下:\n" "ASSOC\t\t显示或更改文件扩展名关联\n" "ATTRIB\t\t显示或更改 DOS 文件属性\n" "CALL\t\t在批处理文件中调用另一个批处理文件\n" @@ -13925,7 +13718,7 @@ msgstr "" #: programs/cmd/cmd.rc:365 msgid "Are you sure?" -msgstr "确定吗？" +msgstr "您确定吗?" #: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" @@ -13947,7 +13740,7 @@ msgstr "没有与文件类型 \"%1\" 相关联的打开命令\n" #: programs/cmd/cmd.rc:370 msgid "Overwrite %1?" -msgstr "覆盖 %1？" +msgstr "覆盖 %1?" #: programs/cmd/cmd.rc:371 msgid "More..." @@ -13955,7 +13748,7 @@ msgstr "更多..." #: programs/cmd/cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "批处理中的行可能被截断。正在使用：\n" +msgstr "批处理中的行可能被截断。正在使用:\n" #: programs/cmd/cmd.rc:374 msgid "Argument missing\n" @@ -13983,11 +13776,11 @@ msgstr "当前时间是 %1\n" #: programs/cmd/cmd.rc:381 msgid "Enter new date: " -msgstr "输入新的日期：" +msgstr "输入新的日期: " #: programs/cmd/cmd.rc:382 msgid "Enter new time: " -msgstr "输入新的时间：" +msgstr "输入新的时间: " #: programs/cmd/cmd.rc:383 msgid "Environment variable %1 not defined\n" @@ -14008,7 +13801,7 @@ msgstr "A" #: programs/cmd/cmd.rc:387 msgid "Delete %1?" -msgstr "删除 %1？" +msgstr "删除 %1?" #: programs/cmd/cmd.rc:388 msgid "Echo is %1\n" @@ -14129,7 +13922,7 @@ msgstr "命令历史" #: programs/conhost/conhost.rc:60 msgid "&Buffer size:" -msgstr "缓冲区大小(&B)：" +msgstr "缓冲区大小(&B):" #: programs/conhost/conhost.rc:63 msgid "&Remove duplicates" @@ -14177,11 +13970,11 @@ msgstr "缓冲区" #: programs/conhost/conhost.rc:96 msgid "&Width:" -msgstr "宽度(&W)：" +msgstr "宽度(&W):" #: programs/conhost/conhost.rc:99 msgid "&Height:" -msgstr "高度(&H)：" +msgstr "高度(&H):" #: programs/conhost/conhost.rc:103 msgid "Window size" @@ -14189,11 +13982,11 @@ msgstr "窗口大小" #: programs/conhost/conhost.rc:104 msgid "W&idth:" -msgstr "宽度(&I)：" +msgstr "宽度(&I):" #: programs/conhost/conhost.rc:107 msgid "H&eight:" -msgstr "高度(&E)：" +msgstr "高度(&E):" #: programs/conhost/conhost.rc:111 msgid "End of program" @@ -14313,19 +14106,19 @@ msgstr "" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "语法：fsutil hardlink create <new> <existing>\n" +msgstr "语法: fsutil hardlink create <new> <existing>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" -msgstr "用法：hostname\n" +msgstr "用法: hostname\n" #: programs/hostname/hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "错误：无效的选项 '%c'。\n" +msgstr "错误: 无效的选项 '%c'。\n" #: programs/hostname/hostname.rc:32 msgid "Error: Could not get hostname: %u.\n" -msgstr "错误：无法获取主机名：%u。\n" +msgstr "错误: 无法获取主机名: %u。\n" #: programs/hostname/hostname.rc:33 msgid "" @@ -14335,7 +14128,7 @@ msgstr "错误: 无法使用 hostname 工具设置系统的主机名。\n" #: programs/ipconfig/ipconfig.rc:30 msgid "Usage: ipconfig [ /? | /all ]\n" -msgstr "用法：ipconfig [ /? | /all ]\n" +msgstr "用法: ipconfig [ /? | /all ]\n" #: programs/ipconfig/ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" @@ -14419,7 +14212,7 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"本命令格式为：\n" +"本命令格式为:\n" "\n" "NET 命令 [参数]\n" " -或-\n" @@ -14436,7 +14229,7 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"本命令格式为：\n" +"本命令格式为:\n" "\n" "NET START [服务]\n" "\n" @@ -14451,7 +14244,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"本命令的格式为：\n" +"本命令的格式为:\n" "\n" "NET STOP 服务\n" "\n" @@ -14459,7 +14252,7 @@ msgstr "" #: programs/net/net.rc:33 msgid "Stopping dependent service: %1\n" -msgstr "正在停止依赖的服务： %1\n" +msgstr "正在停止依赖的服务: %1\n" #: programs/net/net.rc:34 msgid "Could not stop service %1\n" @@ -14513,7 +14306,7 @@ msgstr "" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 打开资源：%4!u!\n" +msgstr "%1 %2 %3 打开资源: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -14537,7 +14330,7 @@ msgstr "正在重新连接" #: programs/net/net.rc:43 msgid "The following services are running:\n" -msgstr "下列服务正在运行：\n" +msgstr "下列服务正在运行:\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -14737,11 +14530,11 @@ msgstr "页面设置" #: programs/notepad/notepad.rc:102 msgid "&Header:" -msgstr "页眉(&H)：" +msgstr "页眉(&H):" #: programs/notepad/notepad.rc:104 msgid "&Footer:" -msgstr "页脚(&F)：" +msgstr "页脚(&F):" #: programs/notepad/notepad.rc:107 msgid "Margins (millimeters)" @@ -14749,15 +14542,15 @@ msgstr "边距(毫米)" #: programs/notepad/notepad.rc:108 msgid "&Left:" -msgstr "左(&L)：" +msgstr "左(&L):" #: programs/notepad/notepad.rc:110 msgid "&Top:" -msgstr "上(&T)：" +msgstr "上(&T):" #: programs/notepad/notepad.rc:126 msgid "Encoding:" -msgstr "编码：" +msgstr "编码:" #: programs/notepad/notepad.rc:132 programs/wordpad/wordpad.rc:289 msgctxt "accelerator Select All" @@ -14831,7 +14624,7 @@ msgstr "错误" #: programs/notepad/notepad.rc:74 msgid "Untitled" -msgstr "（未命名）" +msgstr "(未命名)" #: programs/notepad/notepad.rc:77 programs/winedbg/winedbg.rc:42 msgid "Text files (*.txt)" @@ -14843,9 +14636,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"文件“%s”不存在。\n" +"文件 '%s' 不存在。\n" "\n" -"您想新建一个文件吗？" +"您想新建一个文件吗?" #: programs/notepad/notepad.rc:82 msgid "" @@ -14853,13 +14646,13 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"文件“%s”已更改。\n" +"文件 '%s' 已更改。\n" "\n" -"是否保存更改？" +"您要保存更改吗?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." -msgstr "找不到“%s”。" +msgstr "找不到 '%s'。" #: programs/notepad/notepad.rc:85 msgid "Unicode (UTF-16)" @@ -14885,7 +14678,7 @@ msgstr "" "%1\n" "此文件包含 Unicode 字符。如果用 %2 编码保存，这些字符将会丢失。\n" "要保留这些字符，请点“取消”，然后选择一种 Unicode 编码。\n" -"要继续吗？" +"要继续吗?" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..." @@ -14990,7 +14783,7 @@ msgstr "连接到另外一台计算机" #: programs/oleview/oleview.rc:159 msgid "&Machine name:" -msgstr "计算机名称(&M)：" +msgstr "计算机名称(&M):" #: programs/oleview/oleview.rc:167 msgid "System Configuration" @@ -15038,7 +14831,7 @@ msgstr "IPersist 接口查看器" #: programs/oleview/oleview.rc:196 programs/oleview/oleview.rc:208 msgid "Class Name:" -msgstr "类名：" +msgstr "类名:" #: programs/oleview/oleview.rc:198 programs/oleview/oleview.rc:210 msgid "CLSID:" @@ -15305,15 +15098,15 @@ msgstr "移动程序" #: programs/progman/progman.rc:118 msgid "Move program:" -msgstr "移动程序：" +msgstr "移动程序:" #: programs/progman/progman.rc:120 programs/progman/progman.rc:138 msgid "From group:" -msgstr "从此程序组中：" +msgstr "从此程序组中:" #: programs/progman/progman.rc:122 programs/progman/progman.rc:140 msgid "&To group:" -msgstr "移动到程序组(&T)：" +msgstr "移动到程序组(&T):" #: programs/progman/progman.rc:134 msgid "Copy Program" @@ -15321,7 +15114,7 @@ msgstr "复制程序" #: programs/progman/progman.rc:136 msgid "Copy program:" -msgstr "复制程序：" +msgstr "复制程序:" #: programs/progman/progman.rc:152 msgid "Program Group Attributes" @@ -15329,7 +15122,7 @@ msgstr "程序组属性" #: programs/progman/progman.rc:156 msgid "&Group file:" -msgstr "组文件(&G)：" +msgstr "组文件(&G):" #: programs/progman/progman.rc:168 msgid "Program Attributes" @@ -15337,15 +15130,15 @@ msgstr "程序属性" #: programs/progman/progman.rc:172 programs/progman/progman.rc:212 msgid "&Command line:" -msgstr "命令行(&C)：" +msgstr "命令行(&C):" #: programs/progman/progman.rc:174 msgid "&Working directory:" -msgstr "工作目录(&W)：" +msgstr "工作目录(&W):" #: programs/progman/progman.rc:176 msgid "&Key combination:" -msgstr "快捷键(&K)：" +msgstr "快捷键(&K):" #: programs/progman/progman.rc:179 programs/progman/progman.rc:215 msgid "&Minimize at launch" @@ -15361,11 +15154,11 @@ msgstr "修改图标" #: programs/progman/progman.rc:194 msgid "&Filename:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: programs/progman/progman.rc:196 msgid "Current &icon:" -msgstr "当前图标(&I)：" +msgstr "当前图标(&I):" #: programs/progman/progman.rc:210 msgid "Execute Program" @@ -15385,11 +15178,11 @@ msgstr "信息" #: programs/progman/progman.rc:68 msgid "Delete group `%s'?" -msgstr "是否删除程序组 “%s”？" +msgstr "是否删除程序组 `%s'?" #: programs/progman/progman.rc:69 msgid "Delete program `%s'?" -msgstr "是否删除程序组 “%s”?" +msgstr "是否删除程序组 `%s'?" #: programs/progman/progman.rc:70 msgid "Not implemented" @@ -15397,19 +15190,19 @@ msgstr "尚未实现" #: programs/progman/progman.rc:71 msgid "Error reading `%s'." -msgstr "读取文件 “%s” 时发生错误。" +msgstr "读取文件 `%s' 时发生错误。" #: programs/progman/progman.rc:72 msgid "Error writing `%s'." -msgstr "写入文件 “%s” 时发生错误。" +msgstr "写入文件 `%s' 时发生错误。" #: programs/progman/progman.rc:75 msgid "" "The group file `%s' cannot be opened.\n" "Should it be tried further on?" msgstr "" -"不能打开组文件 “%s” 。\n" -"是否继续尝试？" +"不能打开组文件 `%s'。\n" +"是否继续尝试?" #: programs/progman/progman.rc:77 msgid "Help not available." @@ -15421,11 +15214,11 @@ msgstr "在 %s 中发现未知特性" #: programs/progman/progman.rc:79 msgid "File `%s' exists. Not overwritten." -msgstr "文件 “%s” 已经存在。不覆盖已有文件。" +msgstr "文件 `%s' 已经存在。不覆盖已有文件。" #: programs/progman/progman.rc:80 msgid "Save group as `%s' to prevent overwriting original files." -msgstr "将程序组保存为 “%s” 可以避免复盖已有的文件。" +msgstr "将程序组保存为 `%s' 可以避免复盖已有的文件。" #: programs/progman/progman.rc:84 msgid "Libraries (*.dll)" @@ -15448,37 +15241,24 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "输入“REG %1 /?”以获取帮助。\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 无法访问或新建所指定的注册表项\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "操作完成\n" +msgstr "reg: 操作成功完成\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "注册表操作已经取消\n" +msgstr "reg: 注册表操作已被取消\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 找不到所指定的注册表项\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg：系统无法找到指定的注册表键或值\n" +msgstr "reg: 找不到所指定的注册表值\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15489,17 +15269,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "输入“REG /?”以获取帮助。\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -15511,13 +15280,13 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" -"用法：\n" +"用法:\n" " REG [操作] [参数]\n" "\n" -"支持的操作：\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +"支持的操作:\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" -"要获取指定操作的帮助，请输入：\n" +"要获取指定操作的帮助，请输入:\n" " REG [操作] /?\n" "\n" @@ -15733,38 +15502,32 @@ msgid "" msgstr "" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: 无效的键名\n" +msgstr "reg: 无效的注册表项\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg: 无法访问远程设备\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "regedit: 无效的系统键 [%1]\n" +msgstr "reg: 无效的系统项\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: 无效的选项 [%1]。" #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的十六进制值\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的数字值\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的十六进制值\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的十六进制值\n" #: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg：选项 [/d] 后必须紧跟一个有效的字符串\n" +msgstr "reg: 选项 [/d] 后必须紧跟一个有效的字符串\n" #: programs/reg/reg.rc:124 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" @@ -15787,30 +15550,26 @@ msgid "reg: The source and destination keys cannot be the same\n" msgstr "" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "文件 '%1' 已存在。您想要覆盖它吗?" +msgstr "值 '%1\\%2' 已经存在于目标项中。您真的要覆盖它吗?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "您真的要删除注册表键值 '%1' 吗?" +msgstr "您真的要删除注册表值 '%1' 吗?" #: programs/reg/reg.rc:134 msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "您真的要删除 '%1' 下的所有注册表键值吗?" +msgstr "您真的要删除 '%1' 下的所有注册表值吗?" #: programs/reg/reg.rc:135 msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "您真的要删除注册表键 '%1' 吗?" +msgstr "您真的要删除注册表项 '%1' 吗?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit：无法删除注册表键“%1”。\n" +msgstr "reg: 无法删除 '%1' 下所有的注册表值\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -15821,10 +15580,8 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: 无法识别的转义序列 [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: 无法打开注册表键 '%1'。\n" +msgstr "reg: 无法导入注册表项 '%1'\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -15853,7 +15610,7 @@ msgstr "导出注册表文件(&E)..." #: programs/regedit/regedit.rc:47 programs/regedit/regedit.rc:99 #: programs/regedit/regedit.rc:121 msgid "&Key" -msgstr "键(&K)" +msgstr "项(&K)" #: programs/regedit/regedit.rc:49 programs/regedit/regedit.rc:101 #: programs/regedit/regedit.rc:123 @@ -15887,7 +15644,7 @@ msgstr "改名(&R)\tF2" #: programs/regedit/regedit.rc:59 programs/regedit/regedit.rc:114 msgid "&Copy Key Name" -msgstr "复制键名(&C)" +msgstr "复制项名(&C)" #: programs/regedit/regedit.rc:61 programs/regedit/regedit.rc:107 #: programs/wordpad/wordpad.rc:53 @@ -15929,19 +15686,19 @@ msgstr "导出注册表" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" -msgstr "指定分支(&E)：" +msgstr "指定分支(&E):" #: programs/regedit/regedit.rc:278 msgid "Find:" -msgstr "查找：" +msgstr "查找:" #: programs/regedit/regedit.rc:280 msgid "Find in:" -msgstr "查找范围：" +msgstr "查找范围:" #: programs/regedit/regedit.rc:281 msgid "Keys" -msgstr "键" +msgstr "项" #: programs/regedit/regedit.rc:282 msgid "Value names" @@ -15961,7 +15718,7 @@ msgstr "添加收藏" #: programs/regedit/regedit.rc:294 programs/regedit/regedit.rc:305 msgid "Name:" -msgstr "名称：" +msgstr "名称:" #: programs/regedit/regedit.rc:302 msgid "Remove Favorite" @@ -15974,12 +15731,12 @@ msgstr "编辑字符串" #: programs/regedit/regedit.rc:316 programs/regedit/regedit.rc:329 #: programs/regedit/regedit.rc:345 programs/regedit/regedit.rc:358 msgid "Value name:" -msgstr "值名称：" +msgstr "值名称:" #: programs/regedit/regedit.rc:318 programs/regedit/regedit.rc:331 #: programs/regedit/regedit.rc:347 programs/regedit/regedit.rc:360 msgid "Value data:" -msgstr "值数据：" +msgstr "值数据:" #: programs/regedit/regedit.rc:326 msgid "Edit DWORD" @@ -16007,19 +15764,19 @@ msgstr "编辑多个字符串" #: programs/regedit/regedit.rc:159 msgid "Contains commands for working with the whole registry" -msgstr "操作整个注册表的命令" +msgstr "包含用于操作整个注册表的命令" #: programs/regedit/regedit.rc:160 msgid "Contains commands for editing values or keys" -msgstr "编辑键和值的命令" +msgstr "包含用于编辑项或值的命令" #: programs/regedit/regedit.rc:161 msgid "Contains commands for customizing the registry window" -msgstr "操作窗口显示的命令" +msgstr "包含用于自定义注册表窗口的命令" #: programs/regedit/regedit.rc:162 msgid "Contains commands for accessing frequently used keys" -msgstr "用于记录常用键的全部命令" +msgstr "包含用于访问常用项的命令" #: programs/regedit/regedit.rc:163 msgid "" @@ -16028,7 +15785,7 @@ msgstr "包含用于显示注册表编辑器帮助及相关信息的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" -msgstr "创建新键或值的命令" +msgstr "包含用于新建项或值的命令" #: programs/regedit/regedit.rc:149 msgid "Data" @@ -16068,7 +15825,7 @@ msgstr "无法修改所选注册表值。" #: programs/regedit/regedit.rc:248 msgid "Unable to create a new registry key." -msgstr "无法创建新注册表键。" +msgstr "无法创建新注册表项。" #: programs/regedit/regedit.rc:249 msgid "Unable to create a new registry value." @@ -16079,8 +15836,8 @@ msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" -"无法重命名键 '%1'。\n" -"该键名已存在。" +"无法重命名项 '%1'。\n" +"该项名已存在。" #: programs/regedit/regedit.rc:251 msgid "" @@ -16092,20 +15849,20 @@ msgstr "" #: programs/regedit/regedit.rc:252 msgid "Unable to delete the selected registry key." -msgstr "无法删除所选注册表键。" +msgstr "无法删除所选的注册表项。" #: programs/regedit/regedit.rc:253 msgid "Unable to rename the selected registry key." -msgstr "无法重命名所选注册表键。" +msgstr "无法重命名所选的注册表项。" #: programs/regedit/regedit.rc:254 msgid "Unable to rename the selected registry value." -msgstr "无法重命名所选注册表值。" +msgstr "无法重命名所选的注册表项。" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "%1 所包含的键和值已被成功添加到注册表中。" +msgstr "%1 所包含的项和值已被成功添加到注册表中。" #: programs/regedit/regedit.rc:256 msgid "Unable to import %1. The specified file is not a valid registry file." @@ -16141,34 +15898,34 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" msgstr "" -"用法：\n" -" regedit [选项] [文件名] [注册表键]\n" +"用法:\n" +" regedit [选项] [文件名] [注册表项]\n" "\n" -"选项：\n" -" [无选项]\t\t启动该程序的图形界面。\n" -" /L:system.dat\t要修改的 system.dat 文件的位置。\n" -"\t\t\t与其他任意开关兼容。该选项将被忽略。\n" -" /R:user.dat\t\t要修改的 user.dat 文件的位置。\n" -"\t\t\t与其他任意开关兼容。该选项将被忽略。\n" -" /C\t\t\t导入注册表文件的内容。\n" -" /D\t\t\t删除指定的注册表键。\n" -" /E\t\t\t将指定注册表键的内容导出到文件。\n" -"\t\t\t如未指定任何键，将导出整份注册表。\n" -" /S\t\t\t静默模式。不显示任何消息。\n" -" /V\t\t\t使用高级模式启动图形界面。该选项将被忽略。\n" -" /?\t\t\t显示此信息并退出。\n" -" [文件名]\t\t要导入的注册表信息文件的位置。和 [/E] 一同使用时，\n" -"\t\t\t该选项将转而指定用于导出注册表信息的文件的位置。\n" -" [注册表键]\t\t要更改的注册表键。\n" +"选项:\n" +" [无选项] 启动该程序的图形界面。\n" +" /L:system.dat 要修改的 system.dat 文件的位置。\n" +" 与其他任意开关兼容。该选项将被忽略。\n" +" /R:user.dat 要修改的 user.dat 文件的位置。\n" +" 与其他任意开关兼容。该选项将被忽略。\n" +" /C 导入注册表文件的内容。\n" +" /D 删除指定的注册表项。\n" +" /E 将指定注册表项的内容导出到文件。\n" +" 如未指定任何项，将导出整份注册表。\n" +" /S 静默模式。不显示任何消息。\n" +" /V 使用高级模式启动图形界面。该选项将被忽略。\n" +" /? 显示此信息并退出。\n" +" [文件名] 要导入的注册表信息文件的位置。和 [/E] 一同使用时，\n" +" 该选项将转而指定用于导出注册表信息的文件的位置。" +" [注册表项] 要更改的注册表项。\n" "\n" -"用例：\n" +"用例:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit：无效或无法识别的开关 [%1]\n" +msgstr "regedit: 无效或无法识别的开关 [%1]\n" #: programs/regedit/regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -16180,7 +15937,7 @@ msgstr "regedit: 没有指定文件名。\n" #: programs/regedit/regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "regedit：未指定任何要移除的注册表键。\n" +msgstr "regedit: 未指定任何要移除的注册表项。\n" #: programs/regedit/regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" @@ -16230,7 +15987,7 @@ msgstr "regedit: 无法向 '%2' 添加注册表值 '%1'。\n" #: programs/regedit/regedit.rc:424 msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: 无法打开注册表键 '%1'。\n" +msgstr "regedit: 无法打开注册表项 '%1'。\n" #: programs/regedit/regedit.rc:425 msgid "" @@ -16243,16 +16000,16 @@ msgstr "regedit: 注册表值 \"%1\" 将会被导出为二进制数据。\n" #: programs/regedit/regedit.rc:427 msgid "regedit: Invalid system key [%1]\n" -msgstr "regedit: 无效的键名 [%1]\n" +msgstr "regedit: 无效的项名 [%1]\n" #: programs/regedit/regedit.rc:428 msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "regedit: 无法导出 '%1'。未找到指定的注册表键。\n" +msgstr "regedit: 无法导出 '%1'。未找到指定的注册表项。\n" #: programs/regedit/regedit.rc:429 msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit：无法删除注册表键“%1”。\n" +msgstr "regedit: 无法删除注册表项 '%1'。\n" #: programs/regedit/regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -16264,11 +16021,11 @@ msgstr "退出注册表编辑器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" -msgstr "把键添加到收藏夹" +msgstr "把项添加到收藏夹列表中" #: programs/regedit/regedit.rc:189 msgid "Removes keys from the favorites list" -msgstr "从收藏夹中删除键" +msgstr "从收藏夹列表中删除项" #: programs/regedit/regedit.rc:190 msgid "Shows or hides the status bar" @@ -16292,11 +16049,11 @@ msgstr "选定项更名" #: programs/regedit/regedit.rc:195 msgid "Copies the name of the selected key to the clipboard" -msgstr "把键的名称复制到剪贴板" +msgstr "把所选项的名称复制到剪贴板" #: programs/regedit/regedit.rc:196 msgid "Finds a text string in a key, value or data" -msgstr "在键、值或数据中找字符串" +msgstr "在项、值或数据中查找字符串" #: programs/regedit/regedit.rc:197 msgid "Finds next occurrence of text specified in previous search" @@ -16308,7 +16065,7 @@ msgstr "修改值的数据" #: programs/regedit/regedit.rc:171 msgid "Adds a new key" -msgstr "添加新键" +msgstr "添加新项" #: programs/regedit/regedit.rc:172 msgid "Adds a new string value" @@ -16348,7 +16105,7 @@ msgstr "无法打开注册表值 '%1'。" #: programs/regedit/regedit.rc:207 msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "无法编辑该类型的键 (%1!u!)。" +msgstr "无法编辑该类型的项 (%1!u!)。" #: programs/regedit/regedit.rc:208 msgid "The value is too big (%1!u!)." @@ -16360,7 +16117,7 @@ msgstr "确认删除值" #: programs/regedit/regedit.rc:210 msgid "Are you sure you want to delete the selected registry value?" -msgstr "您真的要删除选中的注册表键值吗?" +msgstr "您真的要删除选中的注册表值吗?" #: programs/regedit/regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -16372,7 +16129,7 @@ msgstr "您确认要删除这些值吗?" #: programs/regedit/regedit.rc:214 msgid "New Key #%d" -msgstr "新键 #%d" +msgstr "新项 #%d" #: programs/regedit/regedit.rc:215 msgid "New Value #%d" @@ -16380,7 +16137,7 @@ msgstr "新值 #%d" #: programs/regedit/regedit.rc:205 msgid "Unable to query the registry key '%1'." -msgstr "无法打开注册表键 '%1'。" +msgstr "无法打开注册表项 '%1'。" #: programs/regedit/regedit.rc:170 msgid "Modifies the value's data in binary form" @@ -16400,12 +16157,12 @@ msgstr "添加新可扩展字串值" #: programs/regedit/regedit.rc:212 msgid "Confirm Key Delete" -msgstr "确认删除键" +msgstr "确认删除项" #: programs/regedit/regedit.rc:213 msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "您真的要删除该注册表键及其包含的所有子键吗?" +msgstr "您真的要删除该注册表项及其包含的所有子项吗?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" @@ -16498,37 +16255,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: 成功卸载 DLL \"%1\"\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16559,30 +16285,31 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"启动程序，或用一般用于带有某个后缀的程序打开文档。\n" -"用法：\n" +"用于运行程序，或根据文档的后缀，使用一般用于打开此类文档的程序打开文档。\n" +"用法:\n" "start [选项] 程序文件名 [...]\n" "start [选项] 文档文件名\n" "\n" -"选项：\n" -"“标题”\t设置子窗口的标题。\n" -"/d 目录\t在指定目录启动程序。\n" -"/b\t\t不要为程序创建新控制台。\n" -"/i\t\t使用新环境启动程序。\n" -"/min\t\t最小化启动程序。\n" -"/max\t\t最大化启动程序。\n" -"/low\t\t使用 idle 优先级类启动程序。\n" -"/normal\t\t使用 normal 优先级类启动程序。\n" -"/high\t\t使用 high 优先级类启动程序。\n" -"/realtime\t使用 realtime 优先级类启动程序。\n" -"/abovenormal\t使用 abovenormal 优先级类启动程序。\n" -"/belownormal\t使用 belownormal 优先级类启动程序。\n" -"/n\t\t在指定 NUMA 节点启动程序。\n" -"/affinity 掩码\t使用指定关联性掩码启动程序。\n" -"/wait\t\t等待启动了的程序完成操作后使用其退出代码退出。\n" -"/unix\t\t使用 Unix 文件名并像 Windows 资源管理器一样启动文件。\n" -"/ProgIDOpen\t使用指定 progID 打开文档。\n" -"/?\t\t显示此帮助并退出。\n" +"选项:\n" +"\"标题\" 指定子窗口的标题。\n" +"/d 目录在指定的目录中运行程序。\n" +"/b 不要为程序新建终端。\n" +"/i 使用新的环境变量运行程序。\n" +"/min 以最小化模式运行程序。\n" +"/max 以最大化模式运行程序。\n" +"/low 以 idle 优先级运行程序。\n" +"/normal 以 normal 优先级运行程序。\n" +"/high 以 high 优先级运行程序。\n" +"/realtime 以 realtime 优先级运行程序。\n" +"/abovenormal 以 abovenormal 优先级运行程序。\n" +"/belownormal 以 belownormal 优先级运行程序。\n" +"/node n 在指定的 NUMA 节点中运行程序。\n" +"/affinity 掩码以指定的关联掩码运行程序。\n" +"/wait 等待运行的程序结束，并以它的返回值退出。\n" +"/unix 使用 Unix 文件名并像 Windows 文件管理器一样打开该文件。\n" +"/exec 执行所指定的文件 (在 Wine 内部使用)。\n" +"/ProgIDOpen 以所指定的 progID 打开文档。\n" +"/? 显示此帮助并退出。\n" #: programs/start/start.rc:59 msgid "" @@ -16599,27 +16326,27 @@ msgstr "无法将指定 Unix 文件名转换为 DOS 文件名。" #: programs/taskkill/taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -msgstr "用法：taskkill [/?] [/f] [/im 进程名 | /pid 进程ID]\n" +msgstr "用法: taskkill [/?] [/f] [/im 进程名 | /pid 进程ID]\n" #: programs/taskkill/taskkill.rc:31 msgid "Error: Unknown or invalid command line option specified.\n" -msgstr "错误：指定的命令行选项未知或无效。\n" +msgstr "错误: 指定的命令行选项未知或无效。\n" #: programs/taskkill/taskkill.rc:32 msgid "Error: Invalid command line parameter specified.\n" -msgstr "错误：指定的命令行参数未知或无效。\n" +msgstr "错误: 指定的命令行参数未知或无效。\n" #: programs/taskkill/taskkill.rc:33 msgid "Error: One of options /im or /pid must be specified.\n" -msgstr "错误：必须指定 /im 或 /pid 选项。\n" +msgstr "错误: 必须指定 /im 或 /pid 选项。\n" #: programs/taskkill/taskkill.rc:34 msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "错误：选项 %1 需要命令行参数值。\n" +msgstr "错误: 选项 %1 需要命令行参数值。\n" #: programs/taskkill/taskkill.rc:35 msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "错误：选项 /im 和 /pid 不能共存。\n" +msgstr "错误: 选项 /im 和 /pid 不能共存。\n" #: programs/taskkill/taskkill.rc:36 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" @@ -16640,19 +16367,19 @@ msgstr "已经强行结束 PID 为 %2!u! 的进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:40 msgid "Error: Could not find process \"%1\".\n" -msgstr "错误：找不到进程 \"%1\"。\n" +msgstr "错误: 找不到进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:41 msgid "Error: Unable to enumerate the process list.\n" -msgstr "错误：无法列举进程清单。\n" +msgstr "错误: 无法列举进程清单。\n" #: programs/taskkill/taskkill.rc:42 msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "错误：无法结束进程 \"%1\"。\n" +msgstr "错误: 无法结束进程 \"%1\"。\n" #: programs/taskkill/taskkill.rc:43 msgid "Error: Process self-termination is not permitted.\n" -msgstr "错误：不允许结束本进程。\n" +msgstr "错误: 不允许结束本进程。\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -17386,8 +17113,8 @@ msgid "" "cause undesired results including system instability. Are you\n" "sure you want to change the priority class?" msgstr "" -"警告：改变此进程优先级可能导致意料之外的后果，例如系统不稳定。\n" -"您确定要改变优先权吗？" +"警告: 改变此进程优先级可能导致意料之外的后果，例如系统不稳定。\n" +"您确定要改变优先权吗?" #: programs/taskmgr/taskmgr.rc:305 msgid "Unable to Change Priority" @@ -17401,8 +17128,8 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"警告：结束此进程可能会导致意料之外的后果，例如数据丢失或者系统不稳定。此\n" -"进程可能在被结束之前来不及保存它的状态和数据。您确定要结束这个进程吗？" +"警告: 结束此进程可能会导致意料之外的后果，例如数据丢失或者系统不稳定。此\n" +"进程可能在被结束之前来不及保存它的状态和数据。您确定要结束这个进程吗?" #: programs/taskmgr/taskmgr.rc:311 msgid "Unable to Terminate Process" @@ -17413,8 +17140,8 @@ msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"警告：调试此进程可能会导致数据丢失。\n" -"您确定要连接调试器吗？" +"警告: 调试此进程可能会导致数据丢失。\n" +"您确定要连接调试器吗?" #: programs/taskmgr/taskmgr.rc:314 msgid "Unable to Debug Process" @@ -17459,7 +17186,7 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "卸载命令 '%s' 运行失败，可能是找不到可执行程序。\n" -"您想把这项卸载条目从注册表中删除吗？" +"您想把这项卸载条目从注册表中删除吗?" #: programs/uninstaller/uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" @@ -17499,10 +17226,10 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" -"用法：\n" +"用法:\n" " uninstaller [选项]\n" "\n" -"选项：\n" +"选项:\n" "\n" " --help\t 显示本信息。\n" " --list\t 列出安装在本 Wine prefix 中的所有应用程序。\n" @@ -17566,7 +17293,7 @@ msgid "" "option) any later version." msgstr "" "本程序为自由软件，您可以遵照自由软件基金会出版的 GNU 较宽松通用公共许可证协议" -"（LGPL）来对其进行添加、修改和重新发布。许可协议版本为2.1，您也可以选择采用更" +"(LGPL) 来对其进行添加、修改和重新发布。许可协议版本为 2.1，您也可以选择采用更" "新的版本。" #: programs/winecfg/winecfg.rc:142 @@ -17575,11 +17302,11 @@ msgstr "Windows 注册信息" #: programs/winecfg/winecfg.rc:143 msgid "&Owner:" -msgstr "姓名(&O)：" +msgstr "姓名(&O):" #: programs/winecfg/winecfg.rc:145 msgid "Organi&zation:" -msgstr "组织(&Z)：" +msgstr "组织(&Z):" #: programs/winecfg/winecfg.rc:153 msgid "Application settings" @@ -17604,7 +17331,7 @@ msgstr "删除程序设置(&R)" #: programs/winecfg/winecfg.rc:160 msgid "&Windows Version:" -msgstr "&Windows 版本：" +msgstr "&Windows 版本:" #: programs/winecfg/winecfg.rc:168 msgid "Window settings" @@ -17628,7 +17355,7 @@ msgstr "虚拟桌面(&D)" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" -msgstr "桌面大小(&S)：" +msgstr "桌面大小(&S):" #: programs/winecfg/winecfg.rc:179 msgid "Screen resolution" @@ -17653,7 +17380,7 @@ msgstr "" #: programs/winecfg/winecfg.rc:193 msgid "&New override for library:" -msgstr "新增函数库顶替(&N)：" +msgstr "新增函数库顶替(&N):" #: programs/winecfg/winecfg.rc:195 msgid "A&dd" @@ -17661,7 +17388,7 @@ msgstr "添加(&D)" #: programs/winecfg/winecfg.rc:196 msgid "Existing &overrides:" -msgstr "已有的函数库顶替(&O)：" +msgstr "已有的函数库顶替(&O):" #: programs/winecfg/winecfg.rc:198 msgid "&Edit..." @@ -17711,7 +17438,7 @@ msgstr "添加(&D)..." #: programs/winecfg/winecfg.rc:239 msgid "&Path:" -msgstr "路径(&P)：" +msgstr "路径(&P):" #: programs/winecfg/winecfg.rc:246 programs/winecfg/winecfg.rc:37 msgid "Show Advan&ced" @@ -17719,7 +17446,7 @@ msgstr "显示高级选项(&C)" #: programs/winecfg/winecfg.rc:247 msgid "De&vice:" -msgstr "设备(&V)：" +msgstr "设备(&V):" #: programs/winecfg/winecfg.rc:249 msgid "Bro&wse..." @@ -17727,11 +17454,11 @@ msgstr "浏览(&W)..." #: programs/winecfg/winecfg.rc:251 msgid "&Label:" -msgstr "卷标(&L)：" +msgstr "卷标(&L):" #: programs/winecfg/winecfg.rc:253 msgid "S&erial:" -msgstr "序列号(&E)：" +msgstr "序列号(&E):" #: programs/winecfg/winecfg.rc:256 msgid "&Show dot files" @@ -17747,19 +17474,19 @@ msgstr "默认值" #: programs/winecfg/winecfg.rc:266 msgid "Output device:" -msgstr "输出设备：" +msgstr "输出设备:" #: programs/winecfg/winecfg.rc:267 msgid "Voice output device:" -msgstr "语音输出设备：" +msgstr "语音输出设备:" #: programs/winecfg/winecfg.rc:268 msgid "Input device:" -msgstr "输入设备：" +msgstr "输入设备:" #: programs/winecfg/winecfg.rc:269 msgid "Voice input device:" -msgstr "语音输入设备：" +msgstr "语音输入设备:" #: programs/winecfg/winecfg.rc:274 msgid "&Test Sound" @@ -17771,7 +17498,7 @@ msgstr "扬声器设置" #: programs/winecfg/winecfg.rc:278 msgid "Speakers:" -msgstr "扬声器：" +msgstr "扬声器:" #: programs/winecfg/winecfg.rc:286 msgid "Appearance" @@ -17779,7 +17506,7 @@ msgstr "外观" #: programs/winecfg/winecfg.rc:287 msgid "&Theme:" -msgstr "主题(&T)：" +msgstr "主题(&T):" #: programs/winecfg/winecfg.rc:289 msgid "&Install theme..." @@ -17787,11 +17514,11 @@ msgstr "安装主题(&I)..." #: programs/winecfg/winecfg.rc:294 msgid "It&em:" -msgstr "物件(&E)：" +msgstr "物件(&E):" #: programs/winecfg/winecfg.rc:296 msgid "C&olor:" -msgstr "颜色(&O)：" +msgstr "颜色(&O):" #: programs/winecfg/winecfg.rc:302 msgid "MIME types" @@ -17807,7 +17534,7 @@ msgstr "文件夹" #: programs/winecfg/winecfg.rc:309 msgid "&Link to:" -msgstr "映射至(&L)：" +msgstr "映射至(&L):" #: programs/winecfg/winecfg.rc:33 msgid "Libraries" @@ -17827,7 +17554,7 @@ msgstr "隐藏高级选项(&C)" #: programs/winecfg/winecfg.rc:38 msgid "(No Theme)" -msgstr "（无主题）" +msgstr "(无主题)" #: programs/winecfg/winecfg.rc:39 msgid "Graphics" @@ -17867,11 +17594,11 @@ msgstr "映射至" #: programs/winecfg/winecfg.rc:44 msgid "Wine configuration for %s" -msgstr "Wine 设置：针对 %s" +msgstr "针对 %s 的 Wine 设置" #: programs/winecfg/winecfg.rc:83 msgid "Selected driver: %s" -msgstr "选中的驱动：%s" +msgstr "选中的驱动: %s" #: programs/winecfg/winecfg.rc:84 msgid "(None)" @@ -17879,7 +17606,7 @@ msgstr "(无)" #: programs/winecfg/winecfg.rc:85 msgid "Audio test failed!" -msgstr "音频测试失败！" +msgstr "音频测试失败!" #: programs/winecfg/winecfg.rc:87 msgid "(System default)" @@ -17907,11 +17634,11 @@ msgid "" "Are you sure you want to do this?" msgstr "" "不建议对这个函数库更改载入顺序。\n" -"你确定要如此吗？" +"您确定要如此吗?" #: programs/winecfg/winecfg.rc:54 msgid "Warning: system library" -msgstr "警告：系统函数库" +msgstr "警告: 系统函数库" #: programs/winecfg/winecfg.rc:55 msgid "native" @@ -17990,10 +17717,10 @@ msgid "" "Most Windows applications expect drive C to exist, and will die messily if " "it doesn't. If you proceed, remember to recreate it!" msgstr "" -"你确定要删除 C 盘吗？\n" +"您确定要删除 C 盘吗?\n" "\n" "大部分 Windows 程序都假定 C 盘存在，如找不到 C 盘可能会导致严重错误。如果要继" -"续，请重新建立此盘！" +"续，请重新建立此盘!" #: programs/winecfg/winecfg.rc:76 msgctxt "Drive letter" @@ -18010,9 +17737,9 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"你没有 C 盘。这可不是件好事。\n" +"您没有 C 盘。这可不是件好事。\n" "\n" -"请记得点选“驱动器”标签的“添加”来建立它！\n" +"请记得点选“驱动器”标签的“添加”来建立它!\n" #: programs/winecfg/winecfg.rc:98 msgid "Controls Background" @@ -18162,7 +17889,7 @@ msgid "" "may want to check the <a href=\"https://appdb.winehq.org\">Application " "Database</a> for tips about running this application." msgstr "" -"这可能是由程序的问题或者 Wine 的缺陷造成的。你可能需要查看 <a href=\"https://" +"这可能是由程序的问题或者 Wine 的缺陷造成的。您可能需要查看 <a href=\"https://" "appdb.winehq.org\">Application Databa</a> 来获取运行该应用的相关技巧。" #: programs/winedbg/winedbg.rc:62 @@ -18192,7 +17919,7 @@ msgstr "您系统中的一个程序崩溃了，但是 WineDbg 无法挂载到进 #: programs/winedbg/winedbg.rc:41 msgid "(unidentified)" -msgstr "（未被识别的）" +msgstr "(未被识别的)" #: programs/winedbg/winedbg.rc:44 msgid "Saving failed" @@ -18316,19 +18043,19 @@ msgstr "显示隐藏文件/系统文件(&S)" #: programs/winefile/winefile.rc:159 msgid "&File Name:" -msgstr "文件名(&F)：" +msgstr "文件名(&F):" #: programs/winefile/winefile.rc:161 msgid "Full &Path:" -msgstr "完整路径(&P)：" +msgstr "完整路径(&P):" #: programs/winefile/winefile.rc:163 msgid "Last Change:" -msgstr "最后更改：" +msgstr "最后更改:" #: programs/winefile/winefile.rc:167 msgid "Cop&yright:" -msgstr "版权(&Y)：" +msgstr "版权(&Y):" #: programs/winefile/winefile.rc:175 msgid "&System" @@ -18449,11 +18176,11 @@ msgstr "重置结果" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" -msgstr "祝贺！" +msgstr "祝贺!" #: programs/winemine/winemine.rc:82 msgid "Please enter your name" -msgstr "请输入你的名字" +msgstr "请输入您的名字" #: programs/winemine/winemine.rc:90 msgid "Custom Game" @@ -18473,7 +18200,7 @@ msgstr "地雷" #: programs/winemine/winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "所有结果都将丢失。您确定吗？" +msgstr "所有结果都将丢失。您确定吗?" #: programs/winemine/winemine.rc:30 msgid "WineMine" @@ -18549,7 +18276,7 @@ msgstr "Wine 帮助" #: programs/winhlp32/winhlp32.rc:86 msgid "Error while reading the help file `%s'" -msgstr "读入帮助文件“%s”时发生错误" +msgstr "读入帮助文件 `%s' 时发生错误" #: programs/winhlp32/winhlp32.rc:88 msgid "Summary" @@ -18565,7 +18292,7 @@ msgstr "帮助文件 (*.hlp)" #: programs/winhlp32/winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "找不到文件“%s”。你想要自己找这个文件吗？" +msgstr "找不到文件 '%s'。您想要自己找这个文件吗?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" @@ -18573,23 +18300,23 @@ msgstr "找不到 richedit 的实现……终止" #: programs/winhlp32/winhlp32.rc:94 msgid "Help topics: " -msgstr "帮助主题：" +msgstr "帮助主题: " #: programs/wmic/wmic.rc:28 msgid "Error: Command line not supported\n" -msgstr "错误：不支持此命令行\n" +msgstr "错误: 不支持此命令行\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "错误：找不到该别名\n" +msgstr "错误: 找不到该别名\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "错误：无效查询\n" +msgstr "错误: 无效查询\n" #: programs/wmic/wmic.rc:31 msgid "Error: Invalid syntax for PATH\n" -msgstr "错误：PATH 语法无效\n" +msgstr "错误: PATH 语法无效\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -18927,7 +18654,7 @@ msgstr "文档" #: programs/wordpad/wordpad.rc:192 msgid "Save changes to '%s'?" -msgstr "要保存“%s”吗？" +msgstr "要保存 '%s' 吗?" #: programs/wordpad/wordpad.rc:193 msgid "Finished searching the document." @@ -18941,7 +18668,7 @@ msgstr "RichEdit 装载失败。" msgid "" "You have chosen to save in plain text format, which will cause all " "formatting to be lost. Are you sure that you wish to do this?" -msgstr "你已经选择保存为文本文件，而这可能导致格式丢失。你确定要这么做吗？" +msgstr "您已经选择保存为文本文件，而这可能导致格式丢失。您确定要这么做吗?" #: programs/wordpad/wordpad.rc:198 msgid "Invalid number format." @@ -18957,7 +18684,7 @@ msgstr "不能保存文件。" #: programs/wordpad/wordpad.rc:201 msgid "You do not have access to save the file." -msgstr "你没有保存文件的权限。" +msgstr "您没有保存文件的权限。" #: programs/wordpad/wordpad.rc:202 msgid "Could not open the file." @@ -18965,7 +18692,7 @@ msgstr "不能打开文件。" #: programs/wordpad/wordpad.rc:203 msgid "You do not have access to open the file." -msgstr "你没有打开文件的权限。" +msgstr "您没有打开文件的权限。" #: programs/wordpad/wordpad.rc:204 msgid "Printing not implemented." @@ -18985,7 +18712,7 @@ msgstr "无效参数个数 - 使用 xcopy /? 获取帮助\n" #: programs/xcopy/xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "无效参数 ‘%1’ - 使用 xcopy /? 获取帮助\n" +msgstr "无效参数 '%1' - 使用 xcopy /? 获取帮助\n" #: programs/xcopy/xcopy.rc:32 msgid "Press <Enter> to begin copying\n" @@ -19006,24 +18733,24 @@ msgid "" "(F - File, D - Directory)\n" msgstr "" "%1 是一个在目标路径上的\n" -"文件名还是目录？\n" +"文件名还是目录?\n" "(F - 文件，D - 目录)\n" #: programs/xcopy/xcopy.rc:38 msgid "%1? (Yes|No)\n" -msgstr "%1？(是(Y)|否(N))\n" +msgstr "%1? (是(Y)|否(N))\n" #: programs/xcopy/xcopy.rc:39 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "是否覆盖 %1？(是(Y)|否(N)|全部(A))\n" +msgstr "是否覆盖 %1? (是(Y)|否(N)|全部(A))\n" #: programs/xcopy/xcopy.rc:40 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "无法将“%1”复制为“%2”，错误为 r/c %3!d!\n" +msgstr "无法将 '%1' 复制至 '%2'，错误为 r/c %3!d!\n" #: programs/xcopy/xcopy.rc:42 msgid "Failed during reading of '%1'\n" -msgstr "读取‘%1’失败\n" +msgstr "读取 '%1' 失败\n" #: programs/xcopy/xcopy.rc:46 msgctxt "File key" @@ -19073,11 +18800,11 @@ msgid "" msgstr "" "XCOPY - 将源文件或目录拷贝到目标位置。\n" "\n" -"语法：\n" +"语法:\n" "XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] [/R] [/H]\n" "\t [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y] [/K]\n" "\n" -"说明：\n" +"说明:\n" "[/I] 如果目标位置不存在，并且操作会拷贝两个或更多的文件，就假设目标\n" "\t是目录。\n" "[/S] 拷贝目录和子目录。\n" -- 2.34.1

1 0

[PATCH] server: Store PE image info in process structure.
by Paul Gofman 31 Dec '21

31 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51829 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The effect of the blamed commit 7ef35b33936682c01f1c825b7d1b07567a691c12 is that before the commit a process was failing to create due to NT image path passed to RtlCreateUserProcess(). That was wrong, NT path are what actually works on Windows and DOS paths do not. When the process creation working after the commit the new process started failing early in initialization due to the parent process unmapping the image section and remapping that as an anoymous mapping before the user part of process was initialized (build_main_module() needs correct image info from NtQueryInformationProcess( ProcessImageInformation ). The process failure at that stage makes parent process wait for 20 sec until timeout. dlls/kernel32/tests/loader.c | 15 +++++++++++++++ server/mapping.c | 1 + server/process.c | 13 ++----------- server/process.h | 1 + 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index c5857174403..f990d632f73 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1931,9 +1931,11 @@ static void test_section_access(void) char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; SIZE_T size; + SECTION_IMAGE_INFORMATION image_info; MEMORY_BASIC_INFORMATION info; STARTUPINFOA sti; PROCESS_INFORMATION pi; + NTSTATUS status; DWORD ret; /* prevent displaying of the "Unable to load this DLL" message box */ @@ -2084,6 +2086,19 @@ static void test_section_access(void) ok(!memcmp(buf, section_data, section.SizeOfRawData), "wrong section data\n"); } + status = NtQueryInformationProcess(pi.hProcess, ProcessImageInformation, + &image_info, sizeof(image_info), NULL ); + ok(!status, "Got unexpected status %#x.\n", status); + ok(!(image_info.ImageCharacteristics & IMAGE_FILE_DLL), + "Got unexpected characteristics %#x.\n", nt_header.FileHeader.Characteristics); + status = NtUnmapViewOfSection(pi.hProcess, info.BaseAddress); + ok(!status, "Got unexpected status %#x.\n", status); + status = NtQueryInformationProcess(pi.hProcess, ProcessImageInformation, + &image_info, sizeof(image_info), NULL ); + ok(!status, "Got unexpected status %#x.\n", status); + ok(!(image_info.ImageCharacteristics & IMAGE_FILE_DLL), + "Got unexpected characteristics %#x.\n", nt_header.FileHeader.Characteristics); + SetLastError(0xdeadbeef); ret = TerminateProcess(pi.hProcess, 0); ok(ret, "TerminateProcess() error %d\n", GetLastError()); diff --git a/server/mapping.c b/server/mapping.c index bc9ed5bdcb9..c421bd9961d 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -408,6 +408,7 @@ static void add_process_view( struct thread *thread, struct memory_view *view ) process->image = NULL; if (get_view_nt_name( view, &name ) && (process->image = memdup( name.str, name.len ))) process->imagelen = name.len; + process->pe_info = view->image; return; } } diff --git a/server/process.c b/server/process.c index 0cc7f6b60ee..a14950e456b 100644 --- a/server/process.c +++ b/server/process.c @@ -680,6 +680,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->trace_data = 0; process->rawinput_mouse = NULL; process->rawinput_kbd = NULL; + memset( &process->pe_info, 0, sizeof(process->pe_info) ); list_init( &process->kernel_object ); list_init( &process->thread_list ); list_init( &process->locks ); @@ -1502,17 +1503,7 @@ DECL_HANDLER(get_process_info) reply->session_id = process->session_id; reply->machine = process->machine; if (get_reply_max_size()) - { - client_ptr_t base; - const pe_image_info_t *info; - struct memory_view *view = get_exe_view( process ); - if (view) - { - if ((info = get_view_image_info( view, &base ))) - set_reply_data( info, min( sizeof(*info), get_reply_max_size() )); - } - else set_error( STATUS_PROCESS_IS_TERMINATING ); - } + set_reply_data( &process->pe_info, min( sizeof(process->pe_info), get_reply_max_size() )); release_object( process ); } } diff --git a/server/process.h b/server/process.h index 22ee8178368..d14df38a13f 100644 --- a/server/process.h +++ b/server/process.h @@ -89,6 +89,7 @@ struct process const struct rawinput_device *rawinput_mouse; /* rawinput mouse device, if any */ const struct rawinput_device *rawinput_kbd; /* rawinput keyboard device, if any */ struct list kernel_object; /* list of kernel object pointers */ + pe_image_info_t pe_info; /* image info */ }; /* process functions */ -- 2.33.1

2 1

[PATCH] winex11.drv: Call XRaiseWindow during WM_TAKE_FOCUS handler.
by Ethan Searl 30 Dec '21

30 Dec '21

In the case where the original hwnd rejects the focus and we search for something else, raise the window because it may not be on top. This prevents showing modal windows on top of non-modal. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26503 Signed-off-by: Ethan Searl <internetethansearl(a)gmail.com> --- dlls/winex11.drv/event.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 170111e9c28..183efe17d3a 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -722,7 +722,16 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time ); + if (hwnd && can_activate_window(hwnd)) + { + Window win = X11DRV_get_whole_window(hwnd); + if (win) + { + TRACE("will raise window %p", hwnd); + XRaiseWindow(event->display, win); + } + set_focus( event->display, hwnd, event_time ); + } } else if (protocol == x11drv_atom(_NET_WM_PING)) { -- 2.27.0

1 0

[PATCH resend 1/2] ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES only with DDSCL_NOWINDOWCHANGES or if window inactive.
by Gabriel Ivăncescu 30 Dec '21

30 Dec '21

Fixes a regression introduced by f90d607c67768f19e36d9d74b498594252faa3fd. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50370 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is a regression from last year but I completely forgot about it. Last time, it got no reviews, unfortunately, so it would be nice to have it fixed during this year's code freeze. dlls/ddraw/ddraw.c | 18 ++++++----- dlls/ddraw/tests/ddraw1.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 65 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5b70bb4..848b1d9 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -559,7 +559,7 @@ static HRESULT ddraw_set_focus_window(struct ddraw *ddraw, HWND window) } static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, - BOOL windowed, struct wined3d_swapchain **wined3d_swapchain) + DWORD cooplevel, struct wined3d_swapchain **wined3d_swapchain) { struct wined3d_swapchain_desc swapchain_desc; struct wined3d_display_mode mode; @@ -582,9 +582,11 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, swapchain_desc.backbuffer_count = 1; swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; - swapchain_desc.windowed = windowed; - swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH - | WINED3D_SWAPCHAIN_IMPLICIT | WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; + swapchain_desc.windowed = !(cooplevel & DDSCL_FULLSCREEN); + swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH | WINED3D_SWAPCHAIN_IMPLICIT; + + if ((cooplevel & DDSCL_NOWINDOWCHANGES) || window != GetActiveWindow()) + swapchain_desc.flags |= WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; if (ddraw->flags & DDRAW_NO3D) return wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, @@ -640,7 +642,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, return DD_OK; } -static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL windowed) +static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, DWORD cooplevel) { HRESULT hr; @@ -650,7 +652,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win return E_FAIL; } - if (FAILED(hr = ddraw_attach_d3d_device(ddraw, window, windowed, &ddraw->wined3d_swapchain))) + if (FAILED(hr = ddraw_attach_d3d_device(ddraw, window, cooplevel, &ddraw->wined3d_swapchain))) { ERR("Failed to create swapchain, hr %#x.\n", hr); return hr; @@ -776,7 +778,7 @@ static HRESULT WINAPI ddraw1_RestoreDisplayMode(IDirectDraw *iface) * Unsure about this: DDSCL_FPUSETUP * * These don't seem very important for wine: - * DDSCL_ALLOWREBOOT, DDSCL_NOWINDOWCHANGES, DDSCL_ALLOWMODEX + * DDSCL_ALLOWREBOOT, DDSCL_ALLOWMODEX * * Returns: * DD_OK if the cooperative level was set successfully @@ -945,7 +947,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, ddraw_destroy_swapchain(ddraw); } - if (FAILED(hr = ddraw_create_swapchain(ddraw, window, !(cooplevel & DDSCL_FULLSCREEN)))) + if (FAILED(hr = ddraw_create_swapchain(ddraw, window, cooplevel))) ERR("Failed to create swapchain, hr %#x.\n", hr); if (restore_state) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c9f2aea..f16e428 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2636,6 +2636,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7285c1c..2d488ae 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2714,6 +2714,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 07afc44..ec828ac 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2950,6 +2950,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 29fa343..c66d521 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2615,6 +2615,71 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_NOWINDOWCHANGES); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); -- 2.34.1

3 8

[PATCH] po: Update Russian translation.
by Nikolay Sivov 30 Dec '21

30 Dec '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 704 ++++++++++++++++++++----------------------------------- 1 file changed, 248 insertions(+), 456 deletions(-) diff --git a/po/ru.po b/po/ru.po index 6fe67a18e3e..1076281f7f8 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-12-20 15:34+0300\n" +"PO-Revision-Date: 2021-12-30 18:27+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 3.0.1\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 #: programs/winefile/winefile.rc:114 @@ -33,7 +33,7 @@ msgstr "Жёлтый" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Запретить" #: dlls/aclui/aclui.rc:47 #, fuzzy @@ -3744,10 +3744,8 @@ msgid "Connected" msgstr "Подключено" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Уст-во речевого ввода:" +msgstr "Подключено (устройство xinput)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -3806,10 +3804,8 @@ msgid "Subscript out of range" msgstr "Индекс вне диапазона" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Не хватило бумаги; " +msgstr "Превышен размер стека" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3897,17 +3893,15 @@ msgstr "Ожидается «@»" #: dlls/jscript/jscript.rc:80 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Ошибка компиляции Microsoft JScript" #: dlls/jscript/jscript.rc:81 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Ошибка выполнения Microsoft JScript" #: dlls/jscript/jscript.rc:82 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Неизвестная ошибка" +msgstr "Неизвестная ошибка времени выполнения" #: dlls/jscript/jscript.rc:55 msgid "Number expected" @@ -4012,10 +4006,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Невозможно изменить свойство «|»" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "«[object]» не объект типа «date»" +msgstr "«this» не объект типа «Map»" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -6992,32 +6984,24 @@ msgid "Connection reset by peer.\n" msgstr "Соединение закрыто удалённым узлом.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "Не реализовано" +msgstr "Не реализовано.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "Сбой RPC-вызова.\n" +msgstr "Сбой вызова.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "Подпись файла не обнаружена.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "Неверный уровень системного вызова.\n" +msgstr "Неверный вызов.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "Значение недоступно.\n" +msgstr "В данный момент ресурс недоступен.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 #, fuzzy @@ -7031,18 +7015,12 @@ msgid "Normal" msgstr "Обычный" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "Диск" +msgstr "Письмо" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "Диск" +msgstr "Письмо маленькое" #: dlls/localspl/localspl.rc:39 #, fuzzy @@ -7065,45 +7043,34 @@ msgid "Statement" msgstr "Состояние" #: dlls/localspl/localspl.rc:43 -#, fuzzy #| msgid "&Execute..." msgid "Executive" -msgstr "&Запустить..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy #| msgid "Small" msgid "A4 Small" -msgstr "Мелкий" +msgstr "A4 маленький" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" @@ -7115,11 +7082,11 @@ msgstr "" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 #, fuzzy @@ -7129,87 +7096,83 @@ msgstr "Блокнот" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "Конверт №9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "Конверт №10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "Конверт №11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "Конверт №12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "Конверт №14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "Лист C" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "Лист D" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "Лист E" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "Конверт DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "Конверт C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "Конверт C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "Конверт C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "Конверт C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "Конверт C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "Конверт B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "Конверт B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "Конверт B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "Запечатано PKCS 7" +msgstr "Конверт" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" msgstr "" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "Запечатано PKCS 7" +msgstr "Конверт 6 3/4" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" @@ -7225,25 +7188,23 @@ msgstr "" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "Японский" +msgstr "Японская открытка" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" @@ -7265,10 +7226,8 @@ msgid "Tabloid Extra" msgstr "" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "&Дополнительно" +msgstr "A4 экстра" #: dlls/localspl/localspl.rc:88 #, fuzzy @@ -7290,11 +7249,11 @@ msgstr "" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "Super A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "Super B" #: dlls/localspl/localspl.rc:93 #, fuzzy @@ -7305,7 +7264,7 @@ msgstr "Диск" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 Plus" #: dlls/localspl/localspl.rc:95 #, fuzzy @@ -7319,27 +7278,20 @@ msgid "B5 (JIS) Transverse" msgstr "" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "&Дополнительно" +msgstr "A3 экстра" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "&Дополнительно" +msgstr "A5 экстра" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) экстра" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 #, fuzzy @@ -7354,246 +7306,204 @@ msgstr "" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "Японская двойная открытка" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "Японский конверт Kaku №2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "Японский конверт Kaku №3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "Японский конверт Chou №3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "Японский конверт Chou №4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Письмо (повёрнуто)" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 (повёрнуто)" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 (повёрнуто)" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 (повёрнуто)" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) (повёрнуто)" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) (повёрнуто)" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "Японская открытка (повёрнута)" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "Двойная японская открытка (повёрнута)" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 (повёрнуто)" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "Японский конверт Kaku №2 (повёрнут)" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "Японский конверт Kaku №3 (повёрнут)" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "Японский конверт Chou №3 (повёрнут)" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "Японский конверт Chou №4 (повёрнут)" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) (повёрнуто)" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "Японский конверт You №4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "Японский конверт You №4 (повёрнутый)" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "PRC 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "PRC 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "PRC 32K(Big)" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "PRC 16K (повёрнуто)" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "PRC 32K (повёрнуто)" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "PRC 32K(Big) (повёрнуто)" #: dlls/localspl/localspl.rc:143 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC1 (повёрнут)" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC2 (повёрнут)" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC3 (повёрнут)" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC4 (повёрнут)" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC5 (повёрнут)" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC6 (повёрнут)" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC7 (повёрнут)" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC8 (повёрнут)" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC9 (повёрнут)" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "Запечатано PKCS 7" +msgstr "Конверт PRC10 (повёрнут)" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7653,10 +7563,8 @@ msgid "Sink has not been finalized.\n" msgstr "Приёмник данных не был завершён.\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "Приёмник данных уже был остановлен.\n" +msgstr "Часы были остановлены\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -9140,10 +9048,8 @@ msgid "Select the data you want to connect to:" msgstr "Выберите формат для подключения:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Подключения" +msgstr "Подключение" #: dlls/oledb32/version.rc:69 #, fuzzy @@ -9162,16 +9068,12 @@ msgid "Use &data source name" msgstr "Введите ваше имя" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Сброшено подключений" +msgstr "Использовать &строку подключения" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Подключения" +msgstr "Строка &подключения:" #: dlls/oledb32/version.rc:77 #, fuzzy @@ -9184,42 +9086,32 @@ msgid "2. Enter information to log on to the server" msgstr "" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" msgstr "По&льзователь:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "Пу&стая страница" +msgstr "Пу&стой пароль" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "Неверный пароль.\n" +msgstr "Разрешить &сохранять пароль" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" msgstr "" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Сброшено подключений" +msgstr "&Проверка подключения" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Мастер" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Сетевой диск" +msgstr "Сетевые настройки" #: dlls/oledb32/version.rc:96 #, fuzzy @@ -9238,22 +9130,18 @@ msgid "Connect:" msgstr "Подключено" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." msgstr "сек." #: dlls/oledb32/version.rc:104 -#, fuzzy #| msgid "Success" msgid "A&ccess:" -msgstr "Успех" +msgstr "До&ступ:" #: dlls/oledb32/version.rc:110 -#, fuzzy #| msgid "&All" msgid "All" -msgstr "&Все" +msgstr "Все" #: dlls/oledb32/version.rc:114 msgid "" @@ -9274,10 +9162,9 @@ msgid "Data Link Error" msgstr "Свойства подключения" #: dlls/oledb32/version.rc:50 -#, fuzzy #| msgid "Please select a file." msgid "Please select a provider." -msgstr "Выберите файл." +msgstr "Выберите провайдер." #: dlls/oledb32/version.rc:51 msgid "" @@ -9291,19 +9178,15 @@ msgstr "Свойства подключения" #: dlls/oledb32/version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "Провайдеры OLE DB" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Готово" +msgstr "Чтение" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Файл «Readme»:" +msgstr "Чтение и запись" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" @@ -9322,10 +9205,8 @@ msgid "Share Exclusive" msgstr "" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "Число записей" +msgstr "Запись" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -10514,7 +10395,7 @@ msgstr "" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) Красноярск" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" @@ -10526,11 +10407,11 @@ msgstr "" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) Тбилиси" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:395 msgid "(UTC+12:00) Coordinated Universal Time+12" @@ -10546,7 +10427,7 @@ msgstr "" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) Катманду" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" @@ -10570,7 +10451,7 @@ msgstr "" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) Гаити" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" @@ -10582,7 +10463,7 @@ msgstr "" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) Сараево, Скопье, Варшава, Загреб" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10594,11 +10475,11 @@ msgstr "" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) Касабланка" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:404 msgid "(UTC-08:00) Coordinated Universal Time-08" @@ -10626,7 +10507,7 @@ msgstr "" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) Белград, Братислава, Будапешт, Любляна, Прага" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10638,7 +10519,7 @@ msgstr "" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) Тегеран" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" @@ -10710,7 +10591,7 @@ msgstr "" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) Дублин, Эдинбург, Лиссабон, Лондон" #: dlls/tzres/tzres.rc:342 msgid "South Sudan Standard Time" @@ -10734,7 +10615,7 @@ msgstr "" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) Астана" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" @@ -10758,11 +10639,11 @@ msgstr "" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) Багдад" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:398 msgid "(UTC+13:00) Coordinated Universal Time+13" @@ -10778,7 +10659,7 @@ msgstr "" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) Магадан" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" @@ -10838,7 +10719,7 @@ msgstr "" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) Баку" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" @@ -10862,7 +10743,7 @@ msgstr "" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) Самоа" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" @@ -10874,7 +10755,7 @@ msgstr "" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) Калининград" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" @@ -10898,7 +10779,7 @@ msgstr "" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) Бейрут" #: dlls/tzres/tzres.rc:363 msgid "Tokyo Standard Time" @@ -10934,7 +10815,7 @@ msgstr "" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) Гавана" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" @@ -10946,7 +10827,7 @@ msgstr "" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) Амман" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" @@ -10966,7 +10847,7 @@ msgstr "" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) Ижевск, Самара" #: dlls/tzres/tzres.rc:417 msgid "Volgograd Standard Time" @@ -10978,7 +10859,7 @@ msgstr "" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) Волгоград" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -11002,11 +10883,11 @@ msgstr "" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) Иркутск" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:410 msgid "(UTC-11:00) Coordinated Universal Time-11" @@ -11090,7 +10971,7 @@ msgstr "" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) Афины, Бухарест" #: dlls/tzres/tzres.rc:375 msgid "Turkey Standard Time" @@ -11102,7 +10983,7 @@ msgstr "" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) Стамбул" #: dlls/tzres/tzres.rc:54 msgid "Astrakhan Standard Time" @@ -11114,7 +10995,7 @@ msgstr "" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) Астрахань, Ульяновск" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -11126,7 +11007,7 @@ msgstr "" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) Фиджи" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" @@ -11150,7 +11031,7 @@ msgstr "" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) Юкон" #: dlls/tzres/tzres.rc:354 msgid "Taipei Standard Time" @@ -11174,7 +11055,7 @@ msgstr "" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) Амстердам, Берлин, Берн, Стокгольм, Вена" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" @@ -11186,7 +11067,7 @@ msgstr "" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) Монтевидео" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" @@ -11198,7 +11079,7 @@ msgstr "" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) Исламабад, Карачи" #: dlls/tzres/tzres.rc:366 msgid "Tomsk Standard Time" @@ -11210,7 +11091,7 @@ msgstr "" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) Томск" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11222,7 +11103,7 @@ msgstr "" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) Ереван" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11234,7 +11115,7 @@ msgstr "" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) Канберра, Мельбурн, Сидней" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" @@ -11246,7 +11127,7 @@ msgstr "" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) Новосибирск" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" @@ -11270,7 +11151,7 @@ msgstr "" #: dlls/tzres/tzres.rc:374 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) Чита" #: dlls/tzres/tzres.rc:141 msgid "E. Europe Standard Time" @@ -11282,7 +11163,7 @@ msgstr "" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) Кишинёв" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" @@ -11294,7 +11175,7 @@ msgstr "" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) Гвадалахара, Мехико, Монтеррей" #: dlls/tzres/tzres.rc:330 msgid "Saratov Standard Time" @@ -11306,7 +11187,7 @@ msgstr "" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) Саратов" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" @@ -11354,7 +11235,7 @@ msgstr "" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) Сахалин" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" @@ -11394,7 +11275,7 @@ msgstr "" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:401 msgid "(UTC-02:00) Coordinated Universal Time-02" @@ -11410,7 +11291,7 @@ msgstr "" #: dlls/tzres/tzres.rc:389 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) Аризона" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" @@ -11434,11 +11315,11 @@ msgstr "" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) Аделаида" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:407 msgid "(UTC-09:00) Coordinated Universal Time-09" @@ -11466,7 +11347,7 @@ msgstr "" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) Кабул" #: dlls/tzres/tzres.rc:441 msgid "Yakutsk Standard Time" @@ -11478,7 +11359,7 @@ msgstr "" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) Якутск" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" @@ -11502,7 +11383,7 @@ msgstr "" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) Кувейт, Риад" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" @@ -11538,7 +11419,7 @@ msgstr "" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) Москва, Санкт-Петербург" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" @@ -11562,7 +11443,7 @@ msgstr "" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) Брюссель, Копенгаген, Мадрид, Париж" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" @@ -11574,7 +11455,7 @@ msgstr "" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) Екатеринбург" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" @@ -11582,7 +11463,7 @@ msgstr "" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) Анадырь, Петропавловск-Камчатский" #: dlls/tzres/tzres.rc:435 msgid "West Bank Standard Time" @@ -11606,7 +11487,7 @@ msgstr "" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) Дамаск" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" @@ -11666,7 +11547,7 @@ msgstr "" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) Иерусалим" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" @@ -11702,7 +11583,7 @@ msgstr "" #: dlls/tzres/tzres.rc:434 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) Ашхабад, Ташкент" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" @@ -11714,7 +11595,7 @@ msgstr "" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) Аляска" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" @@ -11726,7 +11607,7 @@ msgstr "" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) Асунсьон" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" @@ -11750,7 +11631,7 @@ msgstr "" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) Триполи" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" @@ -11762,7 +11643,7 @@ msgstr "" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) Сальвадор" #: dlls/tzres/tzres.rc:411 msgid "Venezuela Standard Time" @@ -11798,7 +11679,7 @@ msgstr "" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) Гавайи" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" @@ -11810,7 +11691,7 @@ msgstr "" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) Бангкок, Ханой, Джакарта" #: dlls/tzres/tzres.rc:291 msgid "Qyzylorda Standard Time" @@ -11846,7 +11727,7 @@ msgstr "" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) Окленд, Веллингтон" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" @@ -11870,7 +11751,7 @@ msgstr "" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) Омск" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" @@ -11894,7 +11775,7 @@ msgstr "" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) Минск" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" @@ -11918,7 +11799,7 @@ msgstr "" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) Гренландия" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" @@ -11950,7 +11831,7 @@ msgstr "" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) Каир" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" @@ -11986,7 +11867,7 @@ msgstr "" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) Владивосток" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" @@ -12010,7 +11891,7 @@ msgstr "" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) Сеул" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" @@ -12034,7 +11915,7 @@ msgstr "" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) Найроби" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" @@ -12046,7 +11927,7 @@ msgstr "" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) Хельсинки, Киев, Рига, София, Таллин, Вильнюс" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" @@ -12058,7 +11939,7 @@ msgstr "" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) Бразилиа" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" @@ -12094,7 +11975,7 @@ msgstr "" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) Сантьяго" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" @@ -12118,7 +11999,7 @@ msgstr "" #: dlls/tzres/tzres.rc:422 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) Перт" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -12219,47 +12100,35 @@ msgstr "&Ещё окна..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Переполнение" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "Мало памяти." +msgstr "Недостаточно памяти" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" msgstr "" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Тип данных не совпадает.\n" +msgstr "Несовпадение типов" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "Ошибка ввода/вывода на устройстве.\n" +msgstr "Ошибка ввода/вывода на устройстве" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "Файл уже существует.\n" +msgstr "Файл уже существует" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "Диск полностью заполнен.\n" +msgstr "Диск заполнен" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Слишком много открытых файлов.\n" +msgstr "Слишком много файлов" #: dlls/vbscript/vbscript.rc:40 #, fuzzy @@ -12272,10 +12141,8 @@ msgid "Path/File access error" msgstr "" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "Путь не найден.\n" +msgstr "Путь не найден" #: dlls/vbscript/vbscript.rc:43 #, fuzzy @@ -12284,48 +12151,36 @@ msgid "Object variable not set" msgstr "(значение не задано)" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Неподходящий пользовательский буфер.\n" +msgstr "Некорректное использование Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "Не удалось создать временный файл" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "Сервер автоматизации не может создать объект" +msgstr "Компонент ActiveX не смог создать объект" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "Объект не поддерживает это действие" +msgstr "Класс не поддерживает автоматизацию" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" msgstr "" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "Объект не поддерживает это действие" +msgstr "Объект не поддерживает именованные аргументы" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "Объект не поддерживает это действие" +msgstr "Объект не поддерживает выбор локали" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "Элемент не найден.\n" +msgstr "Именованный аргумент не найден" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" @@ -12338,10 +12193,8 @@ msgid "Object not a collection" msgstr "Нарушение класса объекта" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "Указанный управляющий элемент не найден в сообщении" +msgstr "Указанная функция не найдена в библиотеке" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" @@ -12357,11 +12210,11 @@ msgstr "" #: dlls/vbscript/vbscript.rc:62 msgid "Microsoft VBScript compilation error" -msgstr "" +msgstr "Ошибка компиляции Microsoft VBScript" #: dlls/vbscript/vbscript.rc:63 msgid "Microsoft VBScript runtime error" -msgstr "" +msgstr "Ошибка выполнения Microsoft VBScript" #: dlls/winemac.drv/winemac.rc:33 msgid "Hide %@" @@ -12462,22 +12315,16 @@ msgid "Effective Date" msgstr "" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "Безопасность" +msgstr "Протокол безопасности" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "Подпись" +msgstr "Тип подписи" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Шифрованная файловая система" +msgstr "Тип шифрования" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" @@ -12485,7 +12332,7 @@ msgstr "" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "бит" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n" @@ -13453,13 +13300,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Активная кодовая страница: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Неверное сообщение.\n" +msgstr "Неверная кодовая страница\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -14533,7 +14378,7 @@ msgstr "" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Синтаксис: fsutil hardlink create <новое имя> <существующее имя>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" @@ -15671,37 +15516,24 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "Для справки введите «REG %1 /?».\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: не удалось найти указанный раздел реестра или значение\n" +msgstr "reg: не удалось получить доступ или создать ключ\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "Операция успешно завершена\n" +msgstr "reg: операция успешно завершена\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "Операция с реестром была отменена\n" +msgstr "reg: операция с реестром была отменена\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg: не удалось найти указанный раздел реестра или значение\n" +msgstr "reg: не удалось найти указанный ключ\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg: не удалось найти указанный раздел реестра или значение\n" +msgstr "reg: не удалось найти указанное значение\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15712,17 +15544,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "Для справки введите «REG /?».\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -15734,11 +15555,11 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" -"Вызов:\n" +"Использование:\n" " REG [операция] [параметры]\n" "\n" "Поддерживаемые операции:\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Для получения справки по конкретной операции используйте:\n" " REG [операция] /?\n" @@ -15909,6 +15730,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <файл>\n" +"\n" +" Импорт ключей, значений и данных из указанного файла.\n" +"\n" +" <файл>\n" +" Имя импортируемого файла.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -15954,33 +15782,32 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" Доступ к 32-битным веткам реестра.\n" +"\n" +" /reg:64\n" +" Доступ к 64-битным веткам реестра.\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: неверное имя раздела\n" +msgstr "reg: неверный ключ\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg: не удалось получить доступ к удалённому компьютеру\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: неверный системный ключ [%1]\n" +msgstr "reg: неверный системный ключ\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: неверная опция [%1]. " #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "" -"reg: за опцией [/d] должно следовать число в шестнадцатеричном формате\n" +msgstr "reg: за опцией [/d] должно следовать числовое значение\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" @@ -16012,12 +15839,10 @@ msgid "reg: The source and destination keys cannot be the same\n" msgstr "" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "Файл «%1» уже существует. Вы хотите заменить его?" +msgstr "Значение «%1\\%2» уже существует. Вы хотите заменить его?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" @@ -16032,10 +15857,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Вы точно хотите удалить ключ реестра «%1»?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: не удалось удалить ключ «%1».\n" +msgstr "regedit: не удалось удалить все значения в «%1»\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -16046,10 +15869,8 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: неизвестная управляющая последовательность [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: не удалось открыть ключ «%1».\n" +msgstr "reg: не удалось импортировать ключ «%1»\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -16730,37 +16551,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: DLL «%1» успешно удалена\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16815,6 +16605,8 @@ msgstr "" "/wait Подождать завершения программы и вернуть её код возврата.\n" "/unix Использовать Unix-имя файла и запустить как Windows\n" " Explorer.\n" +"/exec Выполнить указанный файл (для внутреннего использования в " +"Wine).\n" "/ProgIDOpen Открывает документ с помощью указанного progID.\n" "/? Показать эту справку и выйти.\n" -- 2.34.1

1 0

[PATCH] mshtml: Fix use after free in use_gecko_script (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mshtml/script.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 28e07a50c8e..2a0d86c9f76 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1716,12 +1716,13 @@ static BOOL use_gecko_script(IUri *uri) return FALSE; hres = IInternetSecurityManager_MapUrlToZone(get_security_manager(), display_uri, &zone, 0); - SysFreeString(display_uri); if(FAILED(hres)) { WARN("Could not map %s to zone: %08x\n", debugstr_w(display_uri), hres); + SysFreeString(display_uri); return TRUE; } + SysFreeString(display_uri); TRACE("zone %d\n", zone); return zone == URLZONE_UNTRUSTED; } -- 2.34.1

2 1

[PATCH 2/2] ntdll/tests: Remove workarounds for old Windows versions.
by Jacek Caban 30 Dec '21

30 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/path.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-)

1 0

[PATCH 1/2] ntdll: Fix handling \\.\CON path in RtlDosPathNameToNtPathName.
by Jacek Caban 30 Dec '21

30 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32183 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- It seems to be a special case, like in RtlIsDosDeviceName_U. dlls/ntdll/path.c | 4 +++- dlls/ntdll/tests/path.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-)

1 0

[PATCH] comctl32: ShowWindow should be called in REBAR_CommonSetupBand on visibility change
by Jesus Sanz del Rey 30 Dec '21

30 Dec '21

From: StartForKillerMC <jesussanz2003(a)gmail.com> This bug was reported on ReactOS jira: https://jira.reactos.org/browse/CORE-17236 Signed-off-by: StartForKillerMC <jesussanz2003(a)gmail.com> Signed-off-by: Jesus Sanz del Rey <jesussanz2003(a)gmail.com> --- dlls/comctl32/rebar.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 6a065514e60..4934728f23f 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1705,13 +1705,6 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan lpBand->fMask |= lprbbi->fMask; - if( (lprbbi->fMask & RBBIM_STYLE) && - (lpBand->fStyle != lprbbi->fStyle ) ) - { - lpBand->fStyle = lprbbi->fStyle; - uChanged |= RBBIM_STYLE; - } - if( (lprbbi->fMask & RBBIM_COLORS) && ( ( lpBand->clrFore != lprbbi->clrFore ) || ( lpBand->clrBack != lprbbi->clrBack ) ) ) @@ -1748,6 +1741,15 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan uChanged |= RBBIM_CHILD; } + if( (lprbbi->fMask & RBBIM_STYLE) && + (lpBand->fStyle != lprbbi->fStyle ) ) + { + if (lpBand->hwndChild && ((lpBand->fStyle & RBBS_HIDDEN) != (lprbbi->fStyle & RBBS_HIDDEN))) + ShowWindow(lpBand->hwndChild, (lprbbi->fStyle & RBBS_HIDDEN) ? SW_HIDE : (SW_SHOWNOACTIVATE | SW_SHOWNORMAL)); + lpBand->fStyle = lprbbi->fStyle; + uChanged |= RBBIM_STYLE; + } + if( (lprbbi->fMask & RBBIM_CHILDSIZE) && ( (lpBand->cxMinChild != lprbbi->cxMinChild) || (lpBand->cyMinChild != lprbbi->cyMinChild ) || -- 2.33.0

1 0

[PATCH] comctl32: ShowWindow should be called in REBAR_CommonSetupBand on visibility change
by StartForKillerMC 30 Dec '21

30 Dec '21

This bug was reported on ReactOS jira: https://jira.reactos.org/browse/CORE-17236 Signed-off-by: StartForKillerMC <jesussanz2003(a)gmail.com> --- dlls/comctl32/rebar.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 6a065514e60..4934728f23f 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1705,13 +1705,6 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan lpBand->fMask |= lprbbi->fMask; - if( (lprbbi->fMask & RBBIM_STYLE) && - (lpBand->fStyle != lprbbi->fStyle ) ) - { - lpBand->fStyle = lprbbi->fStyle; - uChanged |= RBBIM_STYLE; - } - if( (lprbbi->fMask & RBBIM_COLORS) && ( ( lpBand->clrFore != lprbbi->clrFore ) || ( lpBand->clrBack != lprbbi->clrBack ) ) ) @@ -1748,6 +1741,15 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan uChanged |= RBBIM_CHILD; } + if( (lprbbi->fMask & RBBIM_STYLE) && + (lpBand->fStyle != lprbbi->fStyle ) ) + { + if (lpBand->hwndChild && ((lpBand->fStyle & RBBS_HIDDEN) != (lprbbi->fStyle & RBBS_HIDDEN))) + ShowWindow(lpBand->hwndChild, (lprbbi->fStyle & RBBS_HIDDEN) ? SW_HIDE : (SW_SHOWNOACTIVATE | SW_SHOWNORMAL)); + lpBand->fStyle = lprbbi->fStyle; + uChanged |= RBBIM_STYLE; + } + if( (lprbbi->fMask & RBBIM_CHILDSIZE) && ( (lpBand->cxMinChild != lprbbi->cxMinChild) || (lpBand->cyMinChild != lprbbi->cyMinChild ) || -- 2.33.0

1 0

[PATCH] comctl32: ShowWindow should be called in REBAR_CommonSetupBand on visibility change
by StartForKillerMC 30 Dec '21

30 Dec '21

This bug was reported on ReactOS jira: https://jira.reactos.org/browse/CORE-17236 --- dlls/comctl32/rebar.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 6a065514e60..4934728f23f 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1705,13 +1705,6 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan lpBand->fMask |= lprbbi->fMask; - if( (lprbbi->fMask & RBBIM_STYLE) && - (lpBand->fStyle != lprbbi->fStyle ) ) - { - lpBand->fStyle = lprbbi->fStyle; - uChanged |= RBBIM_STYLE; - } - if( (lprbbi->fMask & RBBIM_COLORS) && ( ( lpBand->clrFore != lprbbi->clrFore ) || ( lpBand->clrBack != lprbbi->clrBack ) ) ) @@ -1748,6 +1741,15 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan uChanged |= RBBIM_CHILD; } + if( (lprbbi->fMask & RBBIM_STYLE) && + (lpBand->fStyle != lprbbi->fStyle ) ) + { + if (lpBand->hwndChild && ((lpBand->fStyle & RBBS_HIDDEN) != (lprbbi->fStyle & RBBS_HIDDEN))) + ShowWindow(lpBand->hwndChild, (lprbbi->fStyle & RBBS_HIDDEN) ? SW_HIDE : (SW_SHOWNOACTIVATE | SW_SHOWNORMAL)); + lpBand->fStyle = lprbbi->fStyle; + uChanged |= RBBIM_STYLE; + } + if( (lprbbi->fMask & RBBIM_CHILDSIZE) && ( (lpBand->cxMinChild != lprbbi->cxMinChild) || (lpBand->cyMinChild != lprbbi->cyMinChild ) || -- 2.33.0

1 0

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 30 Dec '21

30 Dec '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-)

1 0

[PATCH] comctl32/listview: Don not paint over header when handling WM_NCPAINT.
by Zhiyi Zhang 30 Dec '21

30 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52285 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/listview.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 41e3db5f9be..9e35f7879b7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10537,8 +10537,8 @@ static LRESULT LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) { LONG exstyle = GetWindowLongW (infoPtr->hwndSelf, GWL_EXSTYLE); HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + RECT r, window_rect; HDC dc; - RECT r; HRGN cliprgn; int cxEdge = GetSystemMetrics (SM_CXEDGE), cyEdge = GetSystemMetrics (SM_CYEDGE); @@ -10552,7 +10552,13 @@ static LRESULT LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) r.right - cxEdge, r.bottom - cyEdge); if (region != (HRGN)1) CombineRgn (cliprgn, cliprgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + if (infoPtr->hwndHeader && LISTVIEW_IsHeaderEnabled(infoPtr)) + { + GetWindowRect(infoPtr->hwndHeader, &window_rect); + r.top = min(r.bottom, r.top + window_rect.bottom - window_rect.top); + } dc = GetDCEx(infoPtr->hwndSelf, region, DCX_WINDOW|DCX_INTERSECTRGN); -- 2.32.0

1 0

[PATCH] combase: Don't use attr.ObjectName after calling create_key (cppcheck)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/combase/combase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 4677972656f..c71158af47c 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -232,7 +232,7 @@ static HKEY create_classes_root_hkey(DWORD access) RtlInitUnicodeString(&name, L"\\Registry\\Machine\\Software\\Classes"); if (create_key( &hkey, access, &attr )) return 0; - TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey ); + TRACE( "%s -> %p\n", debugstr_w(name.Buffer), hkey ); if (!(access & KEY_WOW64_64KEY)) { -- 2.34.1

1 2

[PATCH] combase: Don't change attr->ObjectName in create_key (cppcheck)
by Alex Henrie 30 Dec '21

30 Dec '21

ObjectName can't point to a local variable because it is used later outside of this function. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/combase/combase.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 4677972656f..a3ba3a53fe6 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -186,18 +186,16 @@ static NTSTATUS create_key(HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES * HANDLE subkey, root = attr->RootDirectory; WCHAR *buffer = attr->ObjectName->Buffer; DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); - UNICODE_STRING str; while (i < len && buffer[i] != '\\') i++; if (i == len) return status; attrs = attr->Attributes; - attr->ObjectName = &str; while (i < len) { - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); + attr->ObjectName->Buffer = buffer + pos; + attr->ObjectName->Length = (i - pos) * sizeof(WCHAR); status = NtCreateKey(&subkey, access, attr, 0, NULL, 0, NULL); if (attr->RootDirectory != root) NtClose(attr->RootDirectory); if (status) return status; @@ -206,8 +204,8 @@ static NTSTATUS create_key(HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES * pos = i; while (i < len && buffer[i] != '\\') i++; } - str.Buffer = buffer + pos; - str.Length = (i - pos) * sizeof(WCHAR); + attr->ObjectName->Buffer = buffer + pos; + attr->ObjectName->Length = (i - pos) * sizeof(WCHAR); attr->Attributes = attrs; status = NtCreateKey((HANDLE *)retkey, access, attr, 0, NULL, 0, NULL); if (attr->RootDirectory != root) NtClose(attr->RootDirectory); -- 2.34.1

2 2

[PATCH] shell32: Fix sizeof argument in DoPaste (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/shlview_cmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 6c05904bb91..a7e14b3e241 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1218,7 +1218,7 @@ static HRESULT DoPaste(ContextMenu *This) TRACE("CF_HDROP=%p\n", medium.u.hGlobal); count = DragQueryFileW(medium.u.hGlobal, -1, NULL, 0); - pidls = SHAlloc(count*sizeof(ITEMIDLIST**)); + pidls = SHAlloc(count*sizeof(ITEMIDLIST*)); if (pidls) { for (i = 0; i < count; i++) -- 2.34.1

1 0

[PATCH] mciwave: Fix bad free in MCI_SendCommandAsync (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 13dd927cd42..4f4e69cd0a2 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -124,7 +124,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, async_cmd cmd, DWORD_PTR dwParam1 WARN("Couldn't allocate thread for async command handling, sending synchronously\n"); if (handles[1]) CloseHandle(handles[1]); sca->evt = NULL; - return MCI_SCAStarter(&sca); + return MCI_SCAStarter(sca); } SetThreadPriority(handles[0], THREAD_PRIORITY_TIME_CRITICAL); -- 2.34.1

1 0

[PATCH] winhttp: Fix memory leak on error path in WinHttpCrackUrl (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

And use a single variable for the encoded or decoded URL so that free only has to be called once. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winhttp/url.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 0d9dfb76de6..8efd5ed0c49 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -172,7 +172,7 @@ static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) */ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) { - WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; + WCHAR *p, *q, *r, *url_transformed = NULL; INTERNET_SCHEME scheme_number = 0; struct url_component scheme, username, password, hostname, path, extra; BOOL overflow = FALSE; @@ -189,25 +189,26 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN if (flags & ICU_ESCAPE) { - if ((err = escape_url( url, &len, &url_escaped ))) + if ((err = escape_url( url, &len, &url_transformed ))) { SetLastError( err ); return FALSE; } - url = url_escaped; + url = url_transformed; } else if (flags & ICU_DECODE) { - if (!(url_decoded = decode_url( url, &len ))) + if (!(url_transformed = decode_url( url, &len ))) { SetLastError( ERROR_OUTOFMEMORY ); return FALSE; } - url = url_decoded; + url = url_transformed; } if (!(p = wcschr( url, ':' ))) { SetLastError( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); + free( url_transformed ); return FALSE; } if (p - url == 4 && !wcsnicmp( url, L"http", 4 )) scheme_number = INTERNET_SCHEME_HTTP; @@ -331,8 +332,7 @@ exit: if (overflow) err = ERROR_INSUFFICIENT_BUFFER; uc->nScheme = scheme_number; } - free( url_decoded ); - free( url_escaped ); + free( url_transformed ); SetLastError( err ); return !err; } -- 2.34.1

1 0

[PATCH] msi: Fix memory leak in get_fusion_filename (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msi/package.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7488c095080..596affbaae4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -553,6 +553,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) GetWindowsDirectoryW(windir, MAX_PATH); len = lstrlenW(windir) + lstrlenW(L"Microsoft.NET\\Framework\\") + lstrlenW(L"v2.0.50727") + lstrlenW(L"fusion.dll") + 3; + msi_free(filename); if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; lstrcpyW(filename, windir); -- 2.34.1

1 0

[PATCH] adsldp: Fix memory leak in search_ExecuteSearch (Coverity)
by Alex Henrie 30 Dec '21

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/adsldp/adsldp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 3d5ea29882c..c8f63a25e0c 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1302,7 +1302,11 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props = NULL; else { - if (count && !names) return E_ADS_BAD_PARAMETER; + if (count && !names) + { + heap_free(ldap_ctx); + return E_ADS_BAD_PARAMETER; + } props = heap_alloc((count + 1) * sizeof(props[0])); if (!props) -- 2.34.1

1 0

[PATCH] winegstreamer: Always set the initial video type for the WMF reader to WG_VIDEO_FORMAT_BGR.
by Zebediah Figura 30 Dec '21

30 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52273 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wm_reader.c | 8 +++++--- dlls/wmvcore/tests/wmvcore.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 3a1f1684fdc..693e9adfc19 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1503,9 +1503,11 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) { /* Call of Juarez: Bound in Blood breaks if I420 is enumerated. * Some native decoders output I420, but the msmpeg4v3 decoder - * never does. */ - if (stream->format.u.video.format == WG_VIDEO_FORMAT_I420) - stream->format.u.video.format = WG_VIDEO_FORMAT_YV12; + * never does. + * + * Shadowgrounds provides wmv3 video and assumes that the initial + * video type will be BGR. */ + stream->format.u.video.format = WG_VIDEO_FORMAT_BGR; } wg_parser_stream_enable(stream->wg_stream, &stream->format); } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 66ad89a185e..1b9cffaee1d 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2388,6 +2388,8 @@ static void test_async_reader_types(void) else { ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + /* Shadowgrounds assumes that the initial video type will be RGB24. */ + ok(IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24), "Got subtype %s.\n", debugstr_guid(&mt->subtype)); got_video = true; check_video_type(mt); } -- 2.34.1

1 0

[PATCH] winegstreamer: Use the size of the data read when allocating the read buffer.
by Zebediah Figura 30 Dec '21

30 Dec '21

Instead of the size of the data requested, which may be e.g. UINT_MAX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52277 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 67 ++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0178538fa81..013566b25e9 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -80,11 +80,11 @@ struct wg_parser pthread_cond_t read_cond, read_done_cond; struct { - void *data; + GstBuffer *buffer; uint64_t offset; uint32_t size; bool done; - bool ret; + GstFlowReturn ret; } read_request; bool flushing, sink_connected; @@ -556,7 +556,7 @@ static NTSTATUS wg_parser_get_next_read_offset(void *args) pthread_mutex_lock(&parser->mutex); - while (parser->sink_connected && !parser->read_request.data) + while (parser->sink_connected && !parser->read_request.size) pthread_cond_wait(&parser->read_cond, &parser->mutex); if (!parser->sink_connected) @@ -580,12 +580,35 @@ static NTSTATUS wg_parser_push_data(void *args) uint32_t size = params->size; pthread_mutex_lock(&parser->mutex); - parser->read_request.size = size; - parser->read_request.done = true; - parser->read_request.ret = !!data; + if (data) - memcpy(parser->read_request.data, data, size); - parser->read_request.data = NULL; + { + if (size) + { + GstMapInfo map_info; + + /* Note that we don't allocate the buffer until we have a size. + * midiparse passes a NULL buffer and a size of UINT_MAX, in an + * apparent attempt to read the whole input stream at once. */ + if (!parser->read_request.buffer) + parser->read_request.buffer = gst_buffer_new_and_alloc(size); + gst_buffer_map(parser->read_request.buffer, &map_info, GST_MAP_WRITE); + memcpy(map_info.data, data, size); + gst_buffer_unmap(parser->read_request.buffer, &map_info); + parser->read_request.ret = GST_FLOW_OK; + } + else + { + parser->read_request.ret = GST_FLOW_EOS; + } + } + else + { + parser->read_request.ret = GST_FLOW_ERROR; + } + parser->read_request.done = true; + parser->read_request.size = 0; + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->read_done_cond); @@ -1279,9 +1302,7 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer) { struct wg_parser *parser = gst_pad_get_element_private(pad); - GstBuffer *new_buffer = NULL; - GstMapInfo map_info; - bool ret; + GstFlowReturn ret; GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, size %u, buffer %p.", pad, offset, size, *buffer); @@ -1289,25 +1310,22 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, offset = parser->next_pull_offset; parser->next_pull_offset = offset + size; - if (!*buffer) - *buffer = new_buffer = gst_buffer_new_and_alloc(size); - if (!size) { /* asfreader occasionally asks for zero bytes. gst_buffer_map() will * return NULL in this case. Avoid confusing the read thread by asking * it for zero bytes. */ + if (!*buffer) + *buffer = gst_buffer_new_and_alloc(0); gst_buffer_set_size(*buffer, 0); GST_LOG("Returning empty buffer."); return GST_FLOW_OK; } - gst_buffer_map(*buffer, &map_info, GST_MAP_WRITE); - pthread_mutex_lock(&parser->mutex); - assert(!parser->read_request.data); - parser->read_request.data = map_info.data; + assert(!parser->read_request.size); + parser->read_request.buffer = *buffer; parser->read_request.offset = offset; parser->read_request.size = size; parser->read_request.done = false; @@ -1320,21 +1338,14 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, while (!parser->read_request.done) pthread_cond_wait(&parser->read_done_cond, &parser->mutex); + *buffer = parser->read_request.buffer; ret = parser->read_request.ret; - gst_buffer_set_size(*buffer, parser->read_request.size); pthread_mutex_unlock(&parser->mutex); - gst_buffer_unmap(*buffer, &map_info); - - GST_LOG("Request returned %d.", ret); + GST_LOG("Request returned %s.", gst_flow_get_name(ret)); - if ((!ret || !size) && new_buffer) - gst_buffer_unref(new_buffer); - - if (ret) - return size ? GST_FLOW_OK : GST_FLOW_EOS; - return GST_FLOW_ERROR; + return ret; } static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) -- 2.34.1

1 0

[PATCH] po: Update Korean translation.
by Byeongsik Jeon 30 Dec '21

30 Dec '21

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 111 ++++++++++++++++++++++++++----------------------------- 1 file changed, 52 insertions(+), 59 deletions(-) diff --git a/po/ko.po b/po/ko.po index 6e42d3ba1e7..d6c304bfa8d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-12-02 20:37+0900\n" +"PO-Revision-Date: 2021-12-30 11:19+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -6984,7 +6984,7 @@ msgstr "타블로이드" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "회계 원장" +msgstr "레저" #: dlls/localspl/localspl.rc:41 msgid "Legal" @@ -6992,11 +6992,11 @@ msgstr "리갈" #: dlls/localspl/localspl.rc:42 msgid "Statement" -msgstr "Statement" +msgstr "스테이트먼트" #: dlls/localspl/localspl.rc:43 msgid "Executive" -msgstr "Executive" +msgstr "익스큐티브" #: dlls/localspl/localspl.rc:44 msgid "A3" @@ -7024,11 +7024,11 @@ msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "Folio" +msgstr "폴리오" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "Quarto" +msgstr "쿼토" #: dlls/localspl/localspl.rc:52 msgid "10x14" @@ -7044,23 +7044,23 @@ msgstr "노트" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "봉투 #9" +msgstr "봉투 9호" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "봉투 #10" +msgstr "봉투 10호" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "봉투 #11" +msgstr "봉투 11호" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "봉투 #12" +msgstr "봉투 12호" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "봉투 #14" +msgstr "봉투 14호" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" @@ -7236,7 +7236,7 @@ msgstr "A3 엑스트라 가로" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "일본 이중 엽서" +msgstr "일본 왕복 엽서" #: dlls/localspl/localspl.rc:104 msgid "A6" @@ -7244,19 +7244,19 @@ msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "일본 봉투 Kaku #2" +msgstr "일본 봉투 각형 2호" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "일본 봉투 Kaku #3" +msgstr "일본 봉투 각형 3호" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "일본 봉투 Chou #3" +msgstr "일본 봉투 장형 3호" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "일본 봉투 Chou #4" +msgstr "일본 봉투 장형 4호" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" @@ -7288,7 +7288,7 @@ msgstr "일본 엽서 회전" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "이중 일본 엽서 회전" +msgstr "일본 왕복 엽서 회전" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" @@ -7296,19 +7296,19 @@ msgstr "A6 회전" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "일본 봉투 Kaku #2 회전" +msgstr "일본 봉투 각형 2호 회전" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "일본 봉투 Kaku #3 회전" +msgstr "일본 봉투 각형 3호 회전" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "일본 봉투 Chou #3 회전" +msgstr "일본 봉투 장형 3호 회전" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "일본 봉투 Chou #4 회전" +msgstr "일본 봉투 장형 4호 회전" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" @@ -7324,115 +7324,115 @@ msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "일본 봉투 You #4" +msgstr "일본 봉투 서양형 4호" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "일본 봉투 You #4 회전" +msgstr "일본 봉투 서양형 4호 회전" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "PRC 16K" +msgstr "중국 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "PRC 32K" +msgstr "중국 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "PRC 32K(대)" +msgstr "중국 32K(대)" #: dlls/localspl/localspl.rc:130 msgid "PRC Envelope #1" -msgstr "PRC 봉투 #1" +msgstr "중국 봉투 1호" #: dlls/localspl/localspl.rc:131 msgid "PRC Envelope #2" -msgstr "PRC 봉투 #2" +msgstr "중국 봉투 2호" #: dlls/localspl/localspl.rc:132 msgid "PRC Envelope #3" -msgstr "PRC 봉투 #3" +msgstr "중국 봉투 3호" #: dlls/localspl/localspl.rc:133 msgid "PRC Envelope #4" -msgstr "PRC 봉투 #4" +msgstr "중국 봉투 4호" #: dlls/localspl/localspl.rc:134 msgid "PRC Envelope #5" -msgstr "PRC 봉투 #5" +msgstr "중국 봉투 5호" #: dlls/localspl/localspl.rc:135 msgid "PRC Envelope #6" -msgstr "PRC 봉투 #6" +msgstr "중국 봉투 6호" #: dlls/localspl/localspl.rc:136 msgid "PRC Envelope #7" -msgstr "PRC 봉투 #7" +msgstr "중국 봉투 7호" #: dlls/localspl/localspl.rc:137 msgid "PRC Envelope #8" -msgstr "PRC 봉투 #8" +msgstr "중국 봉투 8호" #: dlls/localspl/localspl.rc:138 msgid "PRC Envelope #9" -msgstr "PRC 봉투 #9" +msgstr "중국 봉투 9호" #: dlls/localspl/localspl.rc:139 msgid "PRC Envelope #10" -msgstr "PRC 봉투 #10" +msgstr "중국 봉투 10호" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "PRC 16K 회전" +msgstr "중국 16K 회전" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "PRC 32K 회전" +msgstr "중국 32K 회전" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "PRC 32K(대) 회전" +msgstr "중국 32K(대) 회전" #: dlls/localspl/localspl.rc:143 msgid "PRC Envelope #1 Rotated" -msgstr "PRC 봉투 #1 회전" +msgstr "중국 봉투 1호 회전" #: dlls/localspl/localspl.rc:144 msgid "PRC Envelope #2 Rotated" -msgstr "PRC 봉투 #2 회전" +msgstr "중국 봉투 2호 회전" #: dlls/localspl/localspl.rc:145 msgid "PRC Envelope #3 Rotated" -msgstr "PRC 봉투 #3 회전" +msgstr "중국 봉투 3호 회전" #: dlls/localspl/localspl.rc:146 msgid "PRC Envelope #4 Rotated" -msgstr "PRC 봉투 #4 회전" +msgstr "중국 봉투 4호 회전" #: dlls/localspl/localspl.rc:147 msgid "PRC Envelope #5 Rotated" -msgstr "PRC 봉투 #5 회전" +msgstr "중국 봉투 5호 회전" #: dlls/localspl/localspl.rc:148 msgid "PRC Envelope #6 Rotated" -msgstr "PRC 봉투 #6 회전" +msgstr "중국 봉투 6호 회전" #: dlls/localspl/localspl.rc:149 msgid "PRC Envelope #7 Rotated" -msgstr "PRC 봉투 #7 회전" +msgstr "중국 봉투 7호 회전" #: dlls/localspl/localspl.rc:150 msgid "PRC Envelope #8 Rotated" -msgstr "PRC 봉투 #8 회전" +msgstr "중국 봉투 8호 회전" #: dlls/localspl/localspl.rc:151 msgid "PRC Envelope #9 Rotated" -msgstr "PRC 봉투 #9 회전" +msgstr "중국 봉투 9호 회전" #: dlls/localspl/localspl.rc:152 msgid "PRC Envelope #10 Rotated" -msgstr "PRC 봉투 #10 회전" +msgstr "중국 봉투 10호 회전" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -10505,22 +10505,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) 더블린, 에든버러, 리스본, 런던" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "수단 표준시" +msgstr "남수단 표준시" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "수단 일광 절약시" +msgstr "남수단 일광 절약시" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) 예루살렘" +msgstr "(UTC+02:00) 주바" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -13332,7 +13326,6 @@ msgstr "" "ECHO OFF는 ECHO ON과 반대 효과가 있습니다(기본값은 ECHO OFF입니다).\n" "ECHO OFF 앞에 @ 기호룰 두어서 ECHO OFF 명령어 자체가 화면에\n" "표시되는 것을 막을 수 있습니다.\n" -"\n" #: programs/cmd/cmd.rc:78 msgid "ERASE <filename> deletes a file or set of files.\n" -- 2.34.1

1 0

[PATCH v2] ws2_32/tests: Increase tolerance in a timing test.
by Zebediah Figura 30 Dec '21

30 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: adjust the message too (thanks Gijs for catching this.) dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 95f858a86e3..8d4af019f16 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3235,7 +3235,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ticks = GetTickCount() - ticks; ok(ret == 0, "select should not return any socket handles\n"); - ok(ticks < 10, "select was blocking for %u ms, expected < 10 ms\n", ticks); + ok(ticks < 100, "select was blocking for %u ms\n", ticks); ok(!FD_ISSET(fdRead, &readfds), "FD should not be set\n"); ok(!FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); ok(!FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); -- 2.34.1

2 1

[PATCH 1/2] ws2_32/tests: Test that the socket returned from accept() inherits event selection parameters.
by Zebediah Figura 30 Dec '21

30 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 46f26d32e50..ec428acaf32 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5222,6 +5222,37 @@ static void test_accept_events(struct event_test_ctx *ctx) closesocket(client); closesocket(listener); + + /* The socket returned from accept() inherits the same parameters. */ + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 2); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT | FD_WRITE); + check_events(ctx, FD_ACCEPT, 0, 200); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + ctx->socket = server; + check_events_todo(ctx, FD_WRITE, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); + + closesocket(server); + closesocket(client); + + closesocket(listener); } static void test_connect_events(struct event_test_ctx *ctx) -- 2.34.1

2 2

[PATCH 1/4] ws2_32/tests: Test selecting the same socket twice.
by Zebediah Figura 29 Dec '21

29 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a678f619342..95f858a86e3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3325,6 +3325,16 @@ static void test_select(void) ok(ret == 1, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + /* select the same socket twice */ + writefds.fd_count = 2; + writefds.fd_array[0] = fdWrite; + writefds.fd_array[1] = fdWrite; + ret = select(0, NULL, &writefds, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(writefds.fd_count == 1, "got count %u\n", writefds.fd_count); + ok(writefds.fd_array[0] == fdWrite, "got fd %#Ix\n", writefds.fd_array[0]); + ok(writefds.fd_array[1] == fdWrite, "got fd %#Ix\n", writefds.fd_array[1]); + /* tests for overlapping fd_set pointers */ FD_ZERO(&readfds); FD_SET(fdWrite, &readfds); -- 2.34.1

2 7

[PATCH] po: Update on Brazilian Portuguese
by Roberto Pungartnik 29 Dec '21

29 Dec '21

2 1

[PATCH] wininet: Do not call InternetUnlockRequestFile when locking failed.
by Robert Wilhelm 29 Dec '21

29 Dec '21

This should fix crashes on W10L vms, when we pass NULL to InternetUnlockRequestFile after prior lock already failed. Crashes are here: https://test.winehq.org/data/tests/wininet:http.html Behavior after crash is here: https://testbot.winehq.org/JobDetails.pl?Key=104580 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wininet/tests/http.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cf3f62f868a..ee56c64fbd9 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1718,10 +1718,13 @@ static void InternetLockRequestFile_test(void) ret = InternetLockRequestFile(req.request, &lock2); ok(ret, "InternetLockRequestFile returned: %x(%u)\n", ret, GetLastError()); + ok(lock2 != NULL, "lock2 == NULL\n"); ok(lock == lock2, "lock != lock2\n"); - ret = InternetUnlockRequestFile(lock2); - ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + if (lock2) { + ret = InternetUnlockRequestFile(lock2); + ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + } ret = DeleteFileA(file_name); ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION, "Deleting file returned %x(%u)\n", ret, GetLastError()); @@ -1731,8 +1734,12 @@ static void InternetLockRequestFile_test(void) ret = DeleteFileA(file_name); ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION, "Deleting file returned %x(%u)\n", ret, GetLastError()); - ret = InternetUnlockRequestFile(lock); - ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + ok(lock != NULL, "lock == 0\n"); + if (lock) + { + ret = InternetUnlockRequestFile(lock); + ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + } ret = DeleteFileA(file_name); ok(ret, "Deleting file returned %x(%u)\n", ret, GetLastError()); -- 2.31.1

3 2

[PATCH 01/10] loader: Use long instead of int for syscall return type in i386 code.
by Jinoh Kang 29 Dec '21

29 Dec '21

Although int = long effectively in i386, this makes it clear that a machine word-width value is being returned. Also, future patches adding syscalls returning pointers can use the same type (long) for return value consistently. While we're at it, slightly change SYSCALL_RET function macro to include the parameter only once. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- loader/preloader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 585be50624f..cb20afd4d5a 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -236,7 +236,7 @@ __ASM_GLOBAL_FUNC(_start, /* wrappers for Linux system calls */ -#define SYSCALL_RET(ret) (((ret) < 0 && (ret) > -4096) ? -1 : (ret)) +#define SYSCALL_RET(ret) (((unsigned long)(ret) > -4096UL) ? -1 : (ret)) static inline __attribute__((noreturn)) void wld_exit( int code ) { @@ -247,7 +247,7 @@ static inline __attribute__((noreturn)) void wld_exit( int code ) static inline int wld_open( const char *name, int flags ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (5 /* SYS_open */), "r" (name), "c" (flags) ); return SYSCALL_RET(ret); @@ -255,7 +255,7 @@ static inline int wld_open( const char *name, int flags ) static inline int wld_close( int fd ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (6 /* SYS_close */), "r" (fd) ); return SYSCALL_RET(ret); @@ -263,7 +263,7 @@ static inline int wld_close( int fd ) static inline ssize_t wld_read( int fd, void *buffer, size_t len ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (3 /* SYS_read */), "r" (fd), "c" (buffer), "d" (len) @@ -273,7 +273,7 @@ static inline ssize_t wld_read( int fd, void *buffer, size_t len ) static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (4 /* SYS_write */), "r" (fd), "c" (buffer), "d" (len) ); return SYSCALL_RET(ret); @@ -281,7 +281,7 @@ static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) static inline int wld_mprotect( const void *addr, size_t len, int prot ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (125 /* SYS_mprotect */), "r" (addr), "c" (len), "d" (prot) ); return SYSCALL_RET(ret); @@ -328,7 +328,7 @@ __ASM_GLOBAL_FUNC(wld_mmap, static inline int wld_prctl( int code, long arg ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (172 /* SYS_prctl */), "r" (code), "c" (arg) ); return SYSCALL_RET(ret); -- 2.31.1

3 11

[PATCH] MAINTAINERS: Updating my email address.
by Esme Povirk 29 Dec '21

29 Dec '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- MAINTAINERS | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1f92c3a50b..97f9c78ae21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -53,7 +53,7 @@ P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> F: dlls/comdlg32/itemdlg.c F: dlls/comdlg32/tests/itemdlg.c @@ -118,7 +118,7 @@ M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/ DotNet Runtime -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/mscoree/ GDI @@ -146,7 +146,7 @@ F: dlls/win32u/printdrv.c F: dlls/win32u/region.c GDIPlus -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/gdiplus/ GPhoto Driver @@ -240,7 +240,7 @@ F: dlls/ole32/marshal.c F: dlls/ole32/usrmarshal.c OLE Storage -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/ole32/filelockbytes.c F: dlls/ole32/memlockbytes.c F: dlls/ole32/stg_stream.c @@ -280,7 +280,7 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 TWAIN -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> F: dlls/twain_32/ F: dlls/sane.ds/ F: dlls/gphoto2.ds/ @@ -314,9 +314,10 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: tools/widl Windows Imaging Component -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/windowscodecs/ F: dlls/windowscodecsext/ +F: dlls/wmphoto/ Windows Management Instrumentation M: Hans Leidekker <hans(a)codeweavers.com> @@ -376,7 +377,7 @@ P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: * F: */ -- 2.30.2

1 0

[PATCH] ntdll/env: RtlCreateProcessParametersEx: Don't add unnecessary padding
by Keno Fischer 29 Dec '21

29 Dec '21

RtlCreateProcessParametersEx tries to align all strings to either 8 or 4 byte boundaries (it seems wine and various windows versions disagree about which). However, using the previous algorithm, we would adding padding bytes for the alignment of the Environment, even if no Environment was specified. Windows does not add these padding bytes and in fact we were testing that they are not present. Prior to this patch, I am seeing the following test failure locally: env.c:461: Test failed: wrong end ptr 00000000002427D6/00000000002427D8 This patch fixes the issue by not allocating the superfluous padding bytes, matching the Windows behavior and fixing the test. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> --- dlls/ntdll/env.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index bb8931a556b..454ca4c234d 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -499,6 +499,11 @@ PRTL_USER_PROCESS_PARAMETERS WINAPI RtlDeNormalizeProcessParams( RTL_USER_PROCES #define ROUND_SIZE(size) (((size) + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) +static void *align_ptr(void *ptr) +{ + return (void*)(((UINT_PTR)ptr + sizeof(void *) - 1) & ~(sizeof(void *) - 1)); +} + /* append a unicode string to the process params data; helper for RtlCreateProcessParameters */ static void append_unicode_string( void **data, const UNICODE_STRING *src, UNICODE_STRING *dst ) @@ -507,13 +512,19 @@ static void append_unicode_string( void **data, const UNICODE_STRING *src, dst->MaximumLength = src->MaximumLength; if (dst->MaximumLength) { - dst->Buffer = *data; + dst->Buffer = align_ptr( *data ); memcpy( dst->Buffer, src->Buffer, dst->Length ); - *data = (char *)dst->Buffer + ROUND_SIZE( dst->MaximumLength ); + *data = (char *)dst->Buffer + dst->MaximumLength; } else dst->Buffer = NULL; } +static void add_rounded_size(SIZE_T *size, SIZE_T new_size) +{ + if (new_size) { + *size = ROUND_SIZE(*size) + new_size; + } +} /****************************************************************************** * RtlCreateProcessParametersEx [NTDLL.@] @@ -556,17 +567,20 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu if (!ShellInfo) ShellInfo = &empty_str; if (!RuntimeInfo) RuntimeInfo = &null_str; - if (Environment) env_size = get_env_length( Environment ) * sizeof(WCHAR); - - size = (sizeof(RTL_USER_PROCESS_PARAMETERS) - + ROUND_SIZE( ImagePathName->MaximumLength ) - + ROUND_SIZE( DllPath->MaximumLength ) - + ROUND_SIZE( curdir.MaximumLength ) - + ROUND_SIZE( CommandLine->MaximumLength ) - + ROUND_SIZE( WindowTitle->MaximumLength ) - + ROUND_SIZE( Desktop->MaximumLength ) - + ROUND_SIZE( ShellInfo->MaximumLength ) - + ROUND_SIZE( RuntimeInfo->MaximumLength )); + size = sizeof(RTL_USER_PROCESS_PARAMETERS); + add_rounded_size(&size, ImagePathName->MaximumLength); + add_rounded_size(&size, DllPath->MaximumLength); + add_rounded_size(&size, curdir.MaximumLength); + add_rounded_size(&size, CommandLine->MaximumLength); + add_rounded_size(&size, WindowTitle->MaximumLength); + add_rounded_size(&size, Desktop->MaximumLength); + add_rounded_size(&size, ShellInfo->MaximumLength); + add_rounded_size(&size, RuntimeInfo->MaximumLength); + + if (Environment) { + env_size = get_env_length( Environment ) * sizeof(WCHAR); + size = ROUND_SIZE(size); + } if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + ROUND_SIZE( env_size ) ))) { @@ -587,7 +601,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu append_unicode_string( &ptr, Desktop, &params->Desktop ); append_unicode_string( &ptr, ShellInfo, &params->ShellInfo ); append_unicode_string( &ptr, RuntimeInfo, &params->RuntimeInfo ); - if (Environment) params->Environment = memcpy( ptr, Environment, env_size ); + if (Environment) params->Environment = memcpy( align_ptr(ptr), Environment, env_size ); *result = params; if (!(flags & PROCESS_PARAMS_FLAG_NORMALIZED)) RtlDeNormalizeProcessParams( params ); } -- 2.25.1

1 0

[PATCH] ws2_32: Correctly null-terminate the addrinfo chain.
by Zebediah Figura 29 Dec '21

29 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52288 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/unixlib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index e89ebe35248..56a0bed308d 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -752,6 +752,7 @@ static NTSTATUS unix_getaddrinfo( void *args ) dst->ai_addrlen = sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, NULL, 0 ); dst->ai_addr = next; sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, dst->ai_addr, dst->ai_addrlen ); + dst->ai_next = NULL; next = (char *)dst->ai_addr + dst->ai_addrlen; if (dst == params->info || !addrinfo_in_list( params->info, dst )) @@ -763,8 +764,6 @@ static NTSTATUS unix_getaddrinfo( void *args ) } } - dst->ai_next = NULL; - freeaddrinfo( unix_info ); return 0; #else -- 2.34.1

1 0

[PATCH] ntdll: Always prefer native signal restorer over the custom one.
by Jinoh Kang 29 Dec '21

29 Dec '21

A few months after the custom signal restorer for Android was commited, bionic rolled its own signal restorer. The patch is at: https://android-review.googlesource.com/c/platform/bionic/+/107692 In general, rolling our own signal restorer is not a good idea since it interferes with unwinding. GDB seems especially unhappy when the signal restorer's name isn't exactly "__restore_rt". Fix this by using the custom signal restorer only if the vDSO has disappeared and libc doesn't supply its own signal restorer. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_i386.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6bb5649e2b5..f98269535bb 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -50,6 +50,9 @@ #ifdef HAVE_SYS_UCONTEXT_H # include <sys/ucontext.h> #endif +#ifdef HAVE_SYS_AUXV_H +# include <sys/auxv.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -150,9 +153,9 @@ typedef struct ucontext #define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpregs->status >> 16) ? (XSAVE_FORMAT *)(FPU_sig(context) + 1) : NULL) #define XState_sig(fpu) (((unsigned int *)fpu->Reserved4)[12] == FP_XSTATE_MAGIC1 ? (XSTATE *)(fpu + 1) : NULL) -#ifdef __ANDROID__ -/* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */ -void rt_sigreturn(void); +#if defined(__linux__) && defined(SA_RESTORER) +/* backup signal restorer if we have unmapped the one in vDSO, and libc doesn't supply its own restorer */ +extern void rt_sigreturn(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( rt_sigreturn, "movl $173,%eax\n\t" /* NR_rt_sigreturn */ "int $0x80" ); @@ -2329,9 +2332,18 @@ void signal_init_process(void) sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO | SA_RESTART | SA_ONSTACK; -#ifdef __ANDROID__ - sig_act.sa_flags |= SA_RESTORER; - sig_act.sa_restorer = rt_sigreturn; +#if defined(__linux__) && defined(SA_RESTORER) + if (!getauxval(AT_SYSINFO_EHDR)) { + struct sigaction real_sig_act; + + sig_act.sa_sigaction = int_handler; + if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error; + if (sigaction( SIGINT, NULL, &real_sig_act ) == -1) goto error; + if (!(real_sig_act.sa_flags & SA_RESTORER)) { + sig_act.sa_flags |= SA_RESTORER; + sig_act.sa_restorer = rt_sigreturn; + } + } #endif sig_act.sa_sigaction = int_handler; if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error; -- 2.31.1

1 0

[PATCH] conhost: Fix status for READ_CONSOLE ioctl
by Keno Fischer 29 Dec '21

29 Dec '21

Without this patch conhost would attempt to process non-existent input, spewing stdout with various cursor moves and incorrectly returning the ReadConsole call early. Fix that by only attempting input processing if there are actually input records to be processed and properly returning STATUS_PENDING if the input processing is not yet complete. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> --- programs/conhost/conhost.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 78f6e345170..64a77e52b43 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1385,7 +1385,14 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_ if (edit_line_grow( console, 1 )) console->edit_line.buf[0] = 0; console->pending_read = out_size; - return process_console_input( console ); + + /* If there are any pending input records, cook them now. */ + if (console->record_count) + { + process_console_input( console ); + } + + return console->edit_line.status; } /* add input events to a console input queue */ -- 2.25.1

2 2

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 29 Dec '21

29 Dec '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)

2 1

[PATCH] po: Update Catalan translation
by Alex Henrie 29 Dec '21

29 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 1258 ++++++++++++++++++++++++++---------------------------- 1 file changed, 594 insertions(+), 664 deletions(-) diff --git a/po/ca.po b/po/ca.po index 9de7d50aea9..a06513cae05 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-12-13 20:27-0700\n" +"PO-Revision-Date: 2021-12-28 21:33-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.4.1\n" +"X-Generator: Poedit 3.0\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 #: programs/winefile/winefile.rc:114 @@ -21,26 +21,20 @@ msgid "Security" msgstr "Seguretat" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Nom d'usuari:" +msgstr "Noms de &grups i d'usuaris:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Groga" +msgstr "Permet" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Denega" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "S'ha denegat el permís" +msgstr "Permisos per a %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -3731,30 +3725,24 @@ msgid "&Disable" msgstr "&Inhabilita" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Reinicia" +msgstr "&Reinicia" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" msgstr "&Habilita" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "Edita reemplaçament" +msgstr "S&obrescriu" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Connectat" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Dispositiu d'entrada de veu:" +msgstr "Connectat (dispositiu de xinput)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" @@ -4002,7 +3990,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "No es pot definir la propietat '|': l'objecte no és extensible" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -4013,10 +4001,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "No es pot modificar la propietat no escrivible '|'" #: dlls/jscript/jscript.rc:77 -#, fuzzy -#| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[objecte]' no és un objecte de data" +msgstr "'this' no és un objecte de Map" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -7014,10 +7000,8 @@ msgid "Resource is not currently available.\n" msgstr "El recurs actualment no està disponible.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Nom de classe:" +msgstr "Blau clásic" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -7025,569 +7009,468 @@ msgid "Normal" msgstr "Normal" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "Lletra" +msgstr "Carta" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "Lletra" +msgstr "Carta petita" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "&Taula" +msgstr "Tabloide" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "Llibre major" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "Legal" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "Estat" +msgstr "Declaració" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "&Executa..." +msgstr "Executiu" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "T" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "T" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "Petita" +msgstr "A4 petit" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "T" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Infoli" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quart" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "Llibreta" +msgstr "Nota" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "Sobre #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "Sobre #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "Sobre #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "Sobre #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "Sobre #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "Full de mida C" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "Full de mida D" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "Full de mida E" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "Sobre DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "Sobre C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "Sobre C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "Sobre C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "Sobre C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "Sobre C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "Sobre B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "Sobre B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "Sobre B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "Sobre de monarca" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre 6 3/4" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "Paper continu estatunidenc estàndard" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "Paper continu alemany estàndard" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "Paper continu alemany legal" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "Japonès" +msgstr "Postal japonès" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "Sobre d'invitació" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "Lletra" +msgstr "Carta extra" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "Legal extra" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "Tabloide extra" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "E&xtres" +msgstr "A4 extra" #: dlls/localspl/localspl.rc:88 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "Letter Transverse" -msgstr "travessat" +msgstr "Carta transversa" #: dlls/localspl/localspl.rc:89 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A4 Transverse" -msgstr "travessat" +msgstr "A4 transvers" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "Carta extra transversa" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "A súper" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "B súper" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "Lletra" +msgstr "Carta plus" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 plus" #: dlls/localspl/localspl.rc:95 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A5 Transverse" -msgstr "travessat" +msgstr "A5 transvers" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) transvers" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "E&xtres" +msgstr "A3 extra" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "E&xtres" +msgstr "A5 extra" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) extra" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "T" +msgstr "A2" #: dlls/localspl/localspl.rc:101 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A3 Transverse" -msgstr "travessat" +msgstr "A3 transvers" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 extra transvers" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "Postal doble japonès" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "T" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "Sobre japonès Kaku #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "Sobre japonès Kaku #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "Sobre japonès Chou #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "Sobre japonès Chou #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "Carta girada" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 girat" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 girat" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 girat" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) girat" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) girat" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "Postal japonès girat" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "Postal japonès doble girat" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 girat" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "Sobre japonès Kaku #2 girat" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "Sobre japonès Kaku #3 girat" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "Sobre japonès Chou #3 girat" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "Sobre japonès Chou #4 girat" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) girat" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "Sobre japonès You #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "Sobre japonès You #4 girat" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "Xinès 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "Xinès 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "Xinès 32K(Gran)" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "Xinès 16K girat" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "Xinès 32K girat" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "Xinès 32K(Gran) girat" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #1 girat" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #2 girat" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #3 girat" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #4 girat" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #5 girat" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #6 girat" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #7 girat" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #8 girat" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #9 girat" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "PKCS 7 Embolicat" +msgstr "Sobre xinès #10 girat" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7858,7 +7741,7 @@ msgstr "No es pot analitzar el flux de bytes.\n" #: dlls/mferror/mferror.mc:417 msgid "Mutually exclusive flags passed to source resolver.\n" -msgstr "S'han passat opcions mutualment exclusives al resolutor de fons.\n" +msgstr "S'han passat opcions mutualment exclusives al resolutor font.\n" #: dlls/mferror/mferror.mc:424 msgid "Unknown bytestream length.\n" @@ -7874,7 +7757,7 @@ msgstr "Cap esdeveniment està disponible.\n" #: dlls/mferror/mferror.mc:445 msgid "Invalid media source state transition.\n" -msgstr "La transició d'estat de fons de mitjans no és vàlida.\n" +msgstr "La transició d'estat de font de mitjans no és vàlida.\n" #: dlls/mferror/mferror.mc:452 msgid "End of media stream has been reached.\n" @@ -10473,7 +10356,7 @@ msgstr "Hora d'estiu de la Xina" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" @@ -10485,7 +10368,7 @@ msgstr "Hora d'estiu de l'Àsia del Nord" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) Krasnoiarsk" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" @@ -10497,17 +10380,15 @@ msgstr "Hora d'estiu de Geòrgia" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) Tbilissi" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:395 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "Temps universal coordinat" +msgstr "(UTC+12:00) Temps universal coordinat+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" @@ -10519,7 +10400,7 @@ msgstr "Hora d'estiu del Nepal" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) Katmandú" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" @@ -10531,7 +10412,7 @@ msgstr "Hora d'estiu de Cap Verd" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) Illes del Cap Verd" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" @@ -10543,19 +10424,19 @@ msgstr "Hora d'estiu de Haití" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) Haití" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" -msgstr "Hora estàndard de l'Europa Central" +msgstr "Hora estàndard de l'Europa central" #: dlls/tzres/tzres.rc:112 msgid "Central European Daylight Time" -msgstr "Hora d'estiu de l'Europa Central" +msgstr "Hora d'estiu de l'Europa central" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) Sarajevo, Skopje, Varsòvia, Zagreb" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" @@ -10567,45 +10448,39 @@ msgstr "Hora d'estiu del Marroc" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) Casablanca" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:404 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "Temps universal coordinat" +msgstr "(UTC-08:00) Temps universal coordinat-08" #: dlls/tzres/tzres.rc:39 -#, fuzzy -#| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "Hora estàndard de l'Atlàntic" +msgstr "Hora estàndard de l'Altai" #: dlls/tzres/tzres.rc:40 -#, fuzzy -#| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "Hora d'estiu de l'Atlàntic" +msgstr "Hora d'estiu de l'Altai" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) Barnaül, Gorno-Altaisk" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" -msgstr "Hora estàndard de l'Europa Central" +msgstr "Hora estàndard de l'Europa central" #: dlls/tzres/tzres.rc:109 msgid "Central Europe Daylight Time" -msgstr "Hora d'estiu de l'Europa Central" +msgstr "Hora d'estiu de l'Europa central" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) Belgrad, Bratislava, Budapest, Ljubljana, Praga" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" @@ -10617,7 +10492,7 @@ msgstr "Hora d'estiu d'Iran" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) Teheran" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" @@ -10628,26 +10503,20 @@ msgid "Saint Pierre Daylight Time" msgstr "Hora d'estiu de Sant Pere" #: dlls/tzres/tzres.rc:320 -#, fuzzy -#| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "Hora estàndard de Sant Pere" +msgstr "(UTC-03:00) Sant Pere i Miquelon" #: dlls/tzres/tzres.rc:327 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "Hora estàndard de Samoa" +msgstr "Hora estàndard de São Tomé" #: dlls/tzres/tzres.rc:328 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "Hora d'estiu de Samoa" +msgstr "Hora d'estiu de São Tomé" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) São Tomé" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" @@ -10659,7 +10528,7 @@ msgstr "Hora d'estiu de Namíbia" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) Windhoek" #: dlls/tzres/tzres.rc:369 msgid "Tonga Standard Time" @@ -10671,7 +10540,7 @@ msgstr "Hora d'estiu de Tonga" #: dlls/tzres/tzres.rc:371 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" @@ -10683,7 +10552,7 @@ msgstr "Hora d'estiu de les muntanyes (Mèxic)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) Chihuahua, La Paz, Mazatlán" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" @@ -10695,35 +10564,31 @@ msgstr "Hora d'estiu GMT" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) Dublín, Edimburg, Lisboa, Londres" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "South Sudan Standard Time" -msgstr "Hora estàndard de Jordània" +msgstr "Hora estàndard de Sudan del Sud" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "Hora d'estiu de Jordània" +msgstr "Hora d'estiu de Sudan del Sud" #: dlls/tzres/tzres.rc:344 msgid "(UTC+02:00) Juba" -msgstr "" +msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" -msgstr "Hora estàndard de l'Àsia Central" +msgstr "Hora estàndard de l'Àsia central" #: dlls/tzres/tzres.rc:103 msgid "Central Asia Daylight Time" -msgstr "Hora d'estiu de l'Àsia Central" +msgstr "Hora d'estiu de l'Àsia central" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) Astanà" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" @@ -10735,7 +10600,7 @@ msgstr "Hora d'estiu de Lord Howe" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) Illa de Lord Howe" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" @@ -10747,17 +10612,15 @@ msgstr "Hora d'estiu àrab" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) Bagdad" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:398 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "Temps universal coordinat" +msgstr "(UTC+13:00) Temps universal coordinat+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" @@ -10769,7 +10632,7 @@ msgstr "Hora d'estiu de Magadan" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" @@ -10781,35 +10644,31 @@ msgstr "Hora d'estiu de Terranova" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) Terranova" #: dlls/tzres/tzres.rc:348 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "Hora estàndard de Jordània" +msgstr "Hora estàndard de Sudan" #: dlls/tzres/tzres.rc:349 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "Hora d'estiu de Jordània" +msgstr "Hora d'estiu de Sudan" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) Khartum" #: dlls/tzres/tzres.rc:438 msgid "West Pacific Standard Time" -msgstr "Hora estàndard del Pacífic Occidental" +msgstr "Hora estàndard del Pacífic occidental" #: dlls/tzres/tzres.rc:439 msgid "West Pacific Daylight Time" -msgstr "Hora d'estiu del Pacífic Occidental" +msgstr "Hora d'estiu del Pacífic occidental" #: dlls/tzres/tzres.rc:440 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" @@ -10821,7 +10680,7 @@ msgstr "Hora d'estiu del Pacífic" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) Hora del Pacífic (EU i Canadà)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" @@ -10833,7 +10692,7 @@ msgstr "Hora d'estiu de l'Azerbaidjan" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) Bakú" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" @@ -10845,7 +10704,7 @@ msgstr "Hora d'estiu de Magallanes" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" @@ -10857,7 +10716,7 @@ msgstr "Hora d'estiu de Samoa" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" @@ -10869,7 +10728,7 @@ msgstr "Hora d'estiu de Kaliningrad" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) Kaliningrad" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" @@ -10881,7 +10740,7 @@ msgstr "Hora d'estiu del Pacífic (Mèxic)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) Baixa Califòrnia" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" @@ -10893,7 +10752,7 @@ msgstr "Hora d'estiu de l'Orient Mitjà" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) Beirut" #: dlls/tzres/tzres.rc:363 msgid "Tokyo Standard Time" @@ -10905,7 +10764,7 @@ msgstr "Hora d'estiu de Tokyo" #: dlls/tzres/tzres.rc:365 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) Osaka, Sapporo, Tòquio" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" @@ -10917,7 +10776,7 @@ msgstr "Hora d'estiu de les Illes de la Línia" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) Illa de Kiritimati" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" @@ -10929,7 +10788,7 @@ msgstr "Hora d'estiu de Cuba" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) L'Havana" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" @@ -10941,7 +10800,7 @@ msgstr "Hora d'estiu de Jordània" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" @@ -10953,31 +10812,27 @@ msgstr "Hora d'estiu central" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) Hora central (EU i Canadà)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" -msgstr "" +msgstr "Zona horària russa 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) Ijevsk, Samara" #: dlls/tzres/tzres.rc:417 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "Hora estàndard de Tonga" +msgstr "Hora estàndard de Volgograd" #: dlls/tzres/tzres.rc:418 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "Hora d'estiu de Tonga" +msgstr "Hora d'estiu de Volgograd" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) Volgograd" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" @@ -10989,29 +10844,27 @@ msgstr "Hora d'estiu de les Açores" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) Açores" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" -msgstr "Hora estàndard de l'Àsia del Norest" +msgstr "Hora estàndard d'Àsia del nord" #: dlls/tzres/tzres.rc:265 msgid "North Asia East Daylight Time" -msgstr "Hora d'estiu de l'Àsia del Norest" +msgstr "Hora d'estiu d'Àsia del norest" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) Irkutsk" #: dlls/tzres/tzres.rc:408 dlls/tzres/tzres.rc:409 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:410 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "Temps universal coordinat" +msgstr "(UTC-11:00) Temps universal coordinat-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" @@ -11023,23 +10876,19 @@ msgstr "Hora d'estiu de l'Argentina" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) Ciutat de Buenos Aires" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "Hora estàndard de Turquia" +msgstr "Hora estàndard de Turks i Caicos" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "Hora d'estiu de Turquia" +msgstr "Hora d'estiu de Turks i Caicos" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) Turks i Caicos" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" @@ -11051,7 +10900,7 @@ msgstr "Hora d'estiu de Marqueses" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) Illes Marqueses" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" @@ -11063,17 +10912,15 @@ msgstr "Hora d'estiu de Birmània" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) Yangon (Rangoon)" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "Coordinated Universal Time" msgstr "Temps universal coordinat" #: dlls/tzres/tzres.rc:392 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "Temps universal coordinat" +msgstr "(UTC) Temps universal coordinat" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" @@ -11085,7 +10932,7 @@ msgstr "Hora d'estiu de l'Índia" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) Chennai, Kolkata, Mumbai, Nova Delhi" #: dlls/tzres/tzres.rc:180 msgid "GTB Standard Time" @@ -11097,7 +10944,7 @@ msgstr "Hora d'estiu GTB" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) Atenes, Bucarest" #: dlls/tzres/tzres.rc:375 msgid "Turkey Standard Time" @@ -11109,23 +10956,19 @@ msgstr "Hora d'estiu de Turquia" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) Istanbul" #: dlls/tzres/tzres.rc:54 -#, fuzzy -#| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "Hora estàndard de l'Àrabia" +msgstr "Hora estàndard d'Àstrakhan" #: dlls/tzres/tzres.rc:55 -#, fuzzy -#| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "Hora d'estiu de l'Àrabia" +msgstr "Hora d'estiu d'Àstrakhan" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) Àstrakhan, Uliànovsk" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" @@ -11137,35 +10980,31 @@ msgstr "Hora d'estiu de Fiji" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) Fiji" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" -msgstr "Hora estàndard del Canadà Central" +msgstr "Hora estàndard del Canadà central" #: dlls/tzres/tzres.rc:88 msgid "Canada Central Daylight Time" -msgstr "Hora d'estiu del Canadà Central" +msgstr "Hora d'estiu del Canadà central" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:444 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "Hora estàndard de Iakutsk" +msgstr "Hora estàndard de Yukon" #: dlls/tzres/tzres.rc:445 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "Hora d'estiu de Iakutsk" +msgstr "Hora d'estiu de Yukon" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:354 msgid "Taipei Standard Time" @@ -11177,19 +11016,19 @@ msgstr "Hora d'estiu de Taipei" #: dlls/tzres/tzres.rc:356 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) Taipei" #: dlls/tzres/tzres.rc:426 msgid "W. Europe Standard Time" -msgstr "Hora estàndard de l'Europa Occidental" +msgstr "Hora estàndard d'Europa de l'oest" #: dlls/tzres/tzres.rc:427 msgid "W. Europe Daylight Time" -msgstr "Hora d'estiu de l'Europa Occidental" +msgstr "Hora d'estiu d'Europa de l'oest" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) Amsterdam, Berlín, Berna, Roma, Estocolm, Viena" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" @@ -11201,7 +11040,7 @@ msgstr "Hora d'estiu de Montevideo" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" @@ -11213,23 +11052,19 @@ msgstr "Hora d'estiu del Pakistan" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) Islamabad, Karachi" #: dlls/tzres/tzres.rc:366 -#, fuzzy -#| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "Hora estàndard de Tokyo" +msgstr "Hora estàndard de Tomsk" #: dlls/tzres/tzres.rc:367 -#, fuzzy -#| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "Hora d'estiu de Tokyo" +msgstr "Hora d'estiu de Tomsk" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" @@ -11241,7 +11076,7 @@ msgstr "Hora d'estiu del Caucas" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) Erevan" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" @@ -11249,67 +11084,59 @@ msgstr "Hora estàndard oriental AUS" #: dlls/tzres/tzres.rc:67 msgid "AUS Eastern Daylight Time" -msgstr "Hora d'estiu oriental AUS" +msgstr "Hora d'estiu de l'est AUS" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" -msgstr "Hora estàndard de l'Àsia del Centre-Nord" +msgstr "Hora estàndard d'Àsia del centre-nord" #: dlls/tzres/tzres.rc:247 msgid "N. Central Asia Daylight Time" -msgstr "Hora d'estiu de l'Àsia del Centre-Nord" +msgstr "Hora d'estiu d'Àsia del centre-nord" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) Novossibirsk" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" -msgstr "Hora estàndard oriental" +msgstr "Hora estàndard de l'est" #: dlls/tzres/tzres.rc:151 msgid "Eastern Daylight Time" -msgstr "Hora d'estiu oriental" +msgstr "Hora d'estiu de l'est" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) Hora de l'est (EU i Canadà)" #: dlls/tzres/tzres.rc:372 -#, fuzzy -#| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "Hora estàndard de Tasmània" +msgstr "Hora estàndard de Transbaikal" #: dlls/tzres/tzres.rc:373 -#, fuzzy -#| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "Hora d'estiu de Tasmània" +msgstr "Hora d'estiu de Transbaikal" #: dlls/tzres/tzres.rc:374 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) Txità" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "Hora estàndard de l'Europa Occidental" +msgstr "Hora estàndard d'Europa de l'est" #: dlls/tzres/tzres.rc:142 -#, fuzzy -#| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "Hora d'estiu de l'Europa Occidental" +msgstr "Hora d'estiu d'Europa de l'est" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) Chisinau" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" @@ -11321,23 +11148,19 @@ msgstr "Hora d'estiu central (Mèxic)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) Guadalajara, Ciutat de Mèxic, Monterrey" #: dlls/tzres/tzres.rc:330 -#, fuzzy -#| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "Hora estàndard de Samoa" +msgstr "Hora estàndard de Saràtov" #: dlls/tzres/tzres.rc:331 -#, fuzzy -#| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "Hora d'estiu de Samoa" +msgstr "Hora d'estiu de Saràtov" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) Saràtov" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" @@ -11349,7 +11172,7 @@ msgstr "Hora d'estiu de l'Atlàntic" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) Hora de l'Atlàntic (Canadà)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" @@ -11361,35 +11184,31 @@ msgstr "Hora d'estiu de les muntanyes" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) Hora de les muntanyes (EU i Canadà)" #: dlls/tzres/tzres.rc:384 msgid "US Eastern Standard Time" -msgstr "Hora estàndard oriental EUA" +msgstr "Hora estàndard de l'est EUA" #: dlls/tzres/tzres.rc:385 msgid "US Eastern Daylight Time" -msgstr "Hora d'estiu oriental EUA" +msgstr "Hora d'estiu de l'est EUA" #: dlls/tzres/tzres.rc:386 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) Indiana (est)" #: dlls/tzres/tzres.rc:321 -#, fuzzy -#| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "Hora estàndard d'Alaska" +msgstr "Hora estàndard de Sakhalín" #: dlls/tzres/tzres.rc:322 -#, fuzzy -#| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "Hora d'estiu d'Alaska" +msgstr "Hora d'estiu de Sakhalín" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) Sakhalín" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" @@ -11401,7 +11220,7 @@ msgstr "Hora d'estiu de Corea del Nord" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) Pyongyang" #: dlls/tzres/tzres.rc:357 msgid "Tasmania Standard Time" @@ -11413,29 +11232,27 @@ msgstr "Hora d'estiu de Tasmània" #: dlls/tzres/tzres.rc:359 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" -msgstr "Hora estàndard de l'Àmerica Central" +msgstr "Hora estàndard de l'Àmerica central" #: dlls/tzres/tzres.rc:100 msgid "Central America Daylight Time" -msgstr "Hora d'estiu de l'Àmerica Central" +msgstr "Hora d'estiu de l'Àmerica central" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) Amèrica central" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:401 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "Temps universal coordinat" +msgstr "(UTC-02:00) Temps universal coordinat-02" #: dlls/tzres/tzres.rc:387 msgid "US Mountain Standard Time" @@ -11447,7 +11264,7 @@ msgstr "Hora d'estiu de les muntanyes EUA" #: dlls/tzres/tzres.rc:389 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" @@ -11459,29 +11276,27 @@ msgstr "Hora d'estiu de l'Àfrica del Sud" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) Harare, Pretòria" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" -msgstr "Hora estàndard d'Austràlia Central" +msgstr "Hora estàndard de l'Austràlia central" #: dlls/tzres/tzres.rc:97 msgid "Cen. Australia Daylight Time" -msgstr "Hora d'estiu d'Austràlia Central" +msgstr "Hora d'estiu de l'Austràlia central" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) Adelaida" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:407 -#, fuzzy -#| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "Temps universal coordinat" +msgstr "(UTC-09:00) Temps universal coordinat-09" #: dlls/tzres/tzres.rc:345 msgid "Sri Lanka Standard Time" @@ -11493,7 +11308,7 @@ msgstr "Hora d'estiu de Sri Lanka" #: dlls/tzres/tzres.rc:347 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) Sri Jayewardenepura" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" @@ -11505,7 +11320,7 @@ msgstr "Hora d'estiu de l'Afganistan" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:441 msgid "Yakutsk Standard Time" @@ -11517,19 +11332,19 @@ msgstr "Hora d'estiu de Iakutsk" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) Iakutsk" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" -msgstr "Hora estàndard de l'Àmerica del Sud-est" +msgstr "Hora estàndard d'Àmerica del sud-est" #: dlls/tzres/tzres.rc:310 msgid "SA Eastern Daylight Time" -msgstr "Hora d'estiu de l'Àmerica del Sud-est" +msgstr "Hora d'estiu d'Àmerica del sud-est" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) Caiena, Fortaleza" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" @@ -11541,7 +11356,7 @@ msgstr "Hora d'estiu àrab" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) Kuwait, Riad" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" @@ -11553,7 +11368,7 @@ msgstr "Hora d'estiu de l'Àrabia" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) Abu Dhabi, Masqat" #: dlls/tzres/tzres.rc:360 msgid "Tocantins Standard Time" @@ -11565,7 +11380,7 @@ msgstr "Hora d'estiu de Tocantins" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) Araguaína" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" @@ -11577,19 +11392,19 @@ msgstr "Hora d'estiu de Rússia" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) Moscou, Sant Petersburg" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" -msgstr "Hora estàndard central occident d'Austràlia" +msgstr "Hora estàndard d'Austràlia del centre-oest" #: dlls/tzres/tzres.rc:64 msgid "Aus Central W. Daylight Time" -msgstr "Hora d'estiu central occident d'Austràlia" +msgstr "Hora d'estiu d'Austràlia del centre-oest" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" @@ -11601,7 +11416,7 @@ msgstr "Hora d'estiu romànic" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) Brussel·les, Copenhaguen, Madrid, París" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" @@ -11613,31 +11428,27 @@ msgstr "Hora d'estiu de Iekaterinburg" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) Iekaterinburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "Zona horària russa 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) Anàdir, Petropàvlovsk-Kamtxatski" #: dlls/tzres/tzres.rc:435 -#, fuzzy -#| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "Hora estàndard de l'Àsia Occidental" +msgstr "Hora estàndard de Cisjordània" #: dlls/tzres/tzres.rc:436 -#, fuzzy -#| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "Hora d'estiu de l'Àsia Occidental" +msgstr "Hora d'estiu de Cisjordània" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:351 msgid "Syria Standard Time" @@ -11649,7 +11460,7 @@ msgstr "Hora d'estiu de Síria" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) Damasc" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" @@ -11661,7 +11472,7 @@ msgstr "Hora d'estiu central AUS" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) Darwin" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" @@ -11673,7 +11484,7 @@ msgstr "Hora d'estiu de Greenwich" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) Monròvia, Reykjavík" #: dlls/tzres/tzres.rc:381 msgid "Ulaanbaatar Standard Time" @@ -11685,23 +11496,19 @@ msgstr "Hora d'estiu d'Ulan Bator" #: dlls/tzres/tzres.rc:383 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) Ulaanbaatar" #: dlls/tzres/tzres.rc:261 -#, fuzzy -#| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "Hora estàndard del Marroc" +msgstr "Hora estàndard de Norfolk" #: dlls/tzres/tzres.rc:262 -#, fuzzy -#| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "Hora d'estiu del Marroc" +msgstr "Hora d'estiu de Norfolk" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) Illa Norfolk" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" @@ -11713,7 +11520,7 @@ msgstr "Hora d'estiu d'Israel" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) Jerusalem" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" @@ -11725,7 +11532,7 @@ msgstr "Hora d'estiu de Bangla Desh" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" @@ -11737,19 +11544,19 @@ msgstr "Hora d'estiu del Pacífic de l'Amèrica del Sud" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) Bogotà, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:432 msgid "West Asia Standard Time" -msgstr "Hora estàndard de l'Àsia Occidental" +msgstr "Hora estàndard d'Àsia de l'oest" #: dlls/tzres/tzres.rc:433 msgid "West Asia Daylight Time" -msgstr "Hora d'estiu de l'Àsia Occidental" +msgstr "Hora d'estiu d'Àsia de l'oest" #: dlls/tzres/tzres.rc:434 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) Aixkhabad, Taixkent" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" @@ -11761,7 +11568,7 @@ msgstr "Hora d'estiu d'Alaska" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" @@ -11773,7 +11580,7 @@ msgstr "Hora d'estiu del Paraguai" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) Asunción" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" @@ -11785,7 +11592,7 @@ msgstr "Hora d'estiu de la línia de canvi de data" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) Línia internacional de canvi de data occidental" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" @@ -11797,7 +11604,7 @@ msgstr "Hora d'estiu de Líbia" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) Trípoli" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" @@ -11809,7 +11616,7 @@ msgstr "Hora d'estiu de Bahia" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:411 msgid "Venezuela Standard Time" @@ -11821,7 +11628,7 @@ msgstr "Hora d'estiu de Veneçuela" #: dlls/tzres/tzres.rc:413 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" @@ -11833,7 +11640,7 @@ msgstr "Hora d'estiu de Bougainville" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) Illa de Bougainville" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" @@ -11845,7 +11652,7 @@ msgstr "Hora d'estiu de Hawaii" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) Hawaii" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" @@ -11857,39 +11664,31 @@ msgstr "Hora d'estiu de l'Àsia del Sud-est" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 -#, fuzzy -#| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "Hora estàndard de Jordània" +msgstr "Hora estàndard de Khizilordà" #: dlls/tzres/tzres.rc:292 -#, fuzzy -#| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "Hora d'estiu de Jordània" +msgstr "Hora d'estiu de Khizilordà" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) Khizilordà" #: dlls/tzres/tzres.rc:429 -#, fuzzy -#| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "Hora estàndard de Tonga" +msgstr "Hora estàndard de Mongòlia de l'oest" #: dlls/tzres/tzres.rc:430 -#, fuzzy -#| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "Hora d'estiu de Tonga" +msgstr "Hora d'estiu de Mongòlia de l'oest" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" @@ -11901,7 +11700,7 @@ msgstr "Hora d'estiu de Nova Zelanda" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" @@ -11913,35 +11712,31 @@ msgstr "Hora d'estiu aleutiana" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) Illes Aleutianes" #: dlls/tzres/tzres.rc:273 -#, fuzzy -#| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "Hora estàndard de Iakutsk" +msgstr "Hora estàndard d'Omsk" #: dlls/tzres/tzres.rc:274 -#, fuzzy -#| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "Hora d'estiu de Iakutsk" +msgstr "Hora d'estiu d'Omsk" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" -msgstr "Hora estàndard del Brasil Central" +msgstr "Hora estàndard del Brasil central" #: dlls/tzres/tzres.rc:106 msgid "Central Brazilian Daylight Time" -msgstr "Hora d'estiu del Brasil Central" +msgstr "Hora d'estiu del Brasil central" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) Cuiabá" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" @@ -11953,19 +11748,19 @@ msgstr "Hora d'estiu de Bielorússia" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" -msgstr "Hora estàndard de l'Àmerica del Sud-oest" +msgstr "Hora estàndard d'Àmerica del sud-oest" #: dlls/tzres/tzres.rc:316 msgid "SA Western Daylight Time" -msgstr "Hora d'estiu de l'Àmerica del Sud-oest" +msgstr "Hora d'estiu d'Àmerica del sud-oest" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" @@ -11977,7 +11772,7 @@ msgstr "Hora d'estiu de Groenlàndia" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) Groenlàndia" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" @@ -11989,15 +11784,15 @@ msgstr "Hora d'estiu de l'Illa de Pasqua" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) Illa de Pasqua" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" -msgstr "" +msgstr "Zona horària russa 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) Txokurdakh" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" @@ -12009,19 +11804,19 @@ msgstr "Hora d'estiu d'Egipte" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) El Caire" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" -msgstr "Hora estàndard oriental (Mèxic)" +msgstr "Hora estàndard de l'est (Mèxic)" #: dlls/tzres/tzres.rc:154 msgid "Eastern Daylight Time (Mexico)" -msgstr "Hora d'estiu oriental (Mèxic)" +msgstr "Hora d'estiu de l'est (Mèxic)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" @@ -12033,7 +11828,7 @@ msgstr "Hora d'estiu de Maurici" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:414 msgid "Vladivostok Standard Time" @@ -12045,7 +11840,7 @@ msgstr "Hora d'estiu de Vladivostok" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) Vladivostok" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" @@ -12057,7 +11852,7 @@ msgstr "Hora d'estiu de Singapur" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) Kuala Lumpur, Singapur" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" @@ -12069,7 +11864,7 @@ msgstr "Hora d'estiu de Corea" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) Seül" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" @@ -12081,19 +11876,19 @@ msgstr "Hora d'estiu de les Illes de Chatham" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) Illes Chatham" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" -msgstr "Hora estàndard de l'Àfrica Oriental" +msgstr "Hora estàndard d'Àfrica de l'est" #: dlls/tzres/tzres.rc:136 msgid "E. Africa Daylight Time" -msgstr "Hora d'estiu de l'Àfrica Oriental" +msgstr "Hora d'estiu d'Àfrica de l'est" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" @@ -12105,43 +11900,43 @@ msgstr "Hora d'estiu FLE" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) Hèlsinki, Kíev, Riga, Sofia, Tallinn, Vílnius" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" -msgstr "Hora estàndard de l'Àmerica del Sudest" +msgstr "Hora estàndard d'Àmerica del sudest" #: dlls/tzres/tzres.rc:145 msgid "E. South America Daylight Time" -msgstr "Hora d'estiu de l'Àmerica del Sudest" +msgstr "Hora d'estiu d'Àmerica del sudest" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) Brasília" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" -msgstr "Hora estàndard del Pacífic Central" +msgstr "Hora estàndard del Pacífic central" #: dlls/tzres/tzres.rc:115 msgid "Central Pacific Daylight Time" -msgstr "Hora d'estiu del Pacífic Central" +msgstr "Hora d'estiu del Pacífic central" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) Illes de Salomó, Nova Caledònia" #: dlls/tzres/tzres.rc:423 msgid "W. Central Africa Standard Time" -msgstr "Hora estàndard de l'Àfrica del Centre-Oest" +msgstr "Hora estàndard d'Àfrica del centre-oest" #: dlls/tzres/tzres.rc:424 msgid "W. Central Africa Daylight Time" -msgstr "Hora d'estiu de l'Àfrica del Centre-Oest" +msgstr "Hora d'estiu d'Àfrica del centre-oest" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) Àfrica del centre-oest" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" @@ -12153,31 +11948,31 @@ msgstr "Hora d'estiu del Pacífic de l'Amèrica del Sud" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) Santiago" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" -msgstr "Hora estàndard de l'Austràlia Oriental" +msgstr "Hora estàndard d'Austràlia de l'est" #: dlls/tzres/tzres.rc:139 msgid "E. Australia Daylight Time" -msgstr "Hora d'estiu de l'Austràlia Oriental" +msgstr "Hora d'estiu d'Austràlia de l'est" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) Brisbane" #: dlls/tzres/tzres.rc:420 msgid "W. Australia Standard Time" -msgstr "Hora estàndard de l'Austràlia Occidental" +msgstr "Hora estàndard d'Austràlia de l'oest" #: dlls/tzres/tzres.rc:421 msgid "W. Australia Daylight Time" -msgstr "Hora d'estiu de l'Austràlia Occidental" +msgstr "Hora d'estiu d'Austràlia de l'oest" #: dlls/tzres/tzres.rc:422 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) Perth" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -12775,7 +12570,7 @@ msgid "" "manufacturer about obtaining a new driver." msgstr "" "El controlador de dispositiu ha donat un tipus de retorn no vàlid. Consulteu " -"amb el fabricant del dispositiu sobre com obtenir un controlador nou." +"amb el fabricant del dispositiu quant a com obtenir un controlador nou." #: dlls/winmm/winmm.rc:73 msgid "" @@ -12783,7 +12578,7 @@ msgid "" "manufacturer about obtaining a new driver." msgstr "" "Hi ha un problema amb el controlador de dispositiu. Consulteu amb el " -"fabricant del dispositiu sobre com obtenir un controlador nou." +"fabricant del dispositiu quant a com obtenir un controlador nou." #: dlls/winmm/winmm.rc:74 msgid "The specified command requires a parameter. Please supply one." @@ -13515,13 +13310,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Pàgina de codificació activa: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "El missatge no és vàlid.\n" +msgstr "Pàgina de codificació no vàlida\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13534,6 +13327,15 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [número]\n" +"\n" +" Estableix o mostra la pàgina de codificació activa de la consola.\n" +"\n" +" número La pàgina de codificació de consola a activar.\n" +"\n" +" Teclegeu CHCP sense número per a mostrar la pàgina de codificació activa\n" +" de la consola.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -14716,7 +14518,7 @@ msgstr "Adreça IPv6" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "Sufix DNS principal" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" @@ -15768,43 +15570,25 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "Teclegeu \"REG %1 /?\" per ajuda.\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" msgstr "" -"reg: El sistema no ha pogut trobar la clau de registre especificada o el " -"valor de registre especificat\n" +"reg: No s'ha pogut crear o accedir a la clau de registre especificada\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "L'operació s'ha acabat amb èxit\n" +msgstr "reg: L'operació s'ha acabat amb èxit\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "S'ha cancel·lat l'operació de registre\n" +msgstr "reg: S'ha cancel·lat l'operació de registre\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "" -"reg: El sistema no ha pogut trobar la clau de registre especificada o el " -"valor de registre especificat\n" +msgstr "reg: No s'ha pogut trobar la clau de registre especificada\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "" -"reg: El sistema no ha pogut trobar la clau de registre especificada o el " -"valor de registre especificat\n" +msgstr "reg: No s'ha pogut trobar el valor de registre especificat\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15815,17 +15599,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "Teclegeu \"REG /?\" per ajuda.\n" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -15841,9 +15614,9 @@ msgstr "" " REG [operació] [paràmetres]\n" "\n" "Operacions admeses:\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" -"Per ajuda sobre una operació específica, teclegeu:\n" +"Per ajuda quant a una operació específica, teclegeu:\n" " REG [operació] /?\n" "\n" @@ -15896,6 +15669,57 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <clau> [/v nom_de_valor | /ve] [/t tipus] [/s separador] [/d dades] " +"[/f]\n" +"\n" +" Afegeix la clau al registre o afegeix un valor nou a una clau de registre\n" +" donada.\n" +"\n" +" <clau>\n" +" La clau de registre a afegir o, si o [/v] o [/ve] s'especifica,\n" +" la clau en la qual afegir les dades de registre noves.\n" +"\n" +" Format: ARREL\\Subclau\n" +"\n" +" ARREL: Una clau de registre predefinida. Això ha de ser una de les\n" +" següents:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subclau: El camí complet a una clau de registre sota una clau ARREL\n" +" donada.\n" +"\n" +" /v <nom_de_valor>\n" +" El nom del valor de registre a afegir.\n" +"\n" +" /ve\n" +" Afegir un valor de registre sense nom. Aquesta opció modifica el valor\n" +" de registre (Default).\n" +"\n" +" /t <tipus>\n" +" El tipus de dades a afegir al registre. Si s'especifica [/t],\n" +" <tipus> ha de ser un dels següents:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" Si no s'especifica [/t], el tipus de dades per defecte és REG_SZ.\n" +"\n" +" /s <separador>\n" +" El caràcter utilitzat per a separar les cadenes en dades de\n" +" REG_MULTI_SZ.\n" +" Si no s'especifica [/s], el separador per defecte és \\0.\n" +"\n" +" /d <dades>\n" +" Les dades a afegir al valor de registre nou.\n" +"\n" +" /f\n" +" Modifica el registre sense demanar confirmació.\n" +"\n" #: programs/reg/reg.rc:202 msgid "" @@ -15931,6 +15755,40 @@ msgid "" "<key2>.\n" "\n" msgstr "" +"REG COPY <clau1> <clau2> [/s] [/f]\n" +"\n" +" Copia a altra ubicació els continguts d'una clau de registre\n" +" especificada. Per defecte, aquesta operació només copia valors de\n" +" registre. Utilitzeu [/s] per a copiar totes les subclaus i tots els\n" +" valors recursivament.\n" +"\n" +" <clau1>, <clau2>\n" +" Claus de registre que especifiquen l'origen (<clau1>) i la destinació\n" +" (<clau2>) de les dades. Si <clau2> no existeix, es crea.\n" +"\n" +" Format: ARREL\\Subclau\n" +"\n" +" ARREL: Una clau de registre predefinida. Això ha de ser una de les\n" +" següents:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subclau: El camí complet a una clau de registre sota una clau ARREL\n" +" donada.\n" +"\n" +" /s\n" +" Copia totes les subclaus i tots els valors de <clau1> a <clau2>.\n" +"\n" +" /f\n" +" Sobrescriu totes les dades de registre en <clau2> sense demanar\n" +" confirmació.\n" +" Aquesta opció no modifica les subclaus i els valors que només\n" +" existeixin en <clau2>.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -15970,6 +15828,42 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <clau> [/v nom_de_valor | /ve | /va] [/f]\n" +"\n" +" Suprimeix una clau de registre (incloent totes les subclaus i valors), o\n" +" suprimeix un o més valors d'una clau de registre donada.\n" +"\n" +" <clau>\n" +" La clau de registre a suprimir o, si s'especifica [/v], [/ve] o [/va],\n" +" la clau de registre en la qual suprimir un o més valors.\n" +"\n" +" Format: ARREL\\Subclau\n" +"\n" +" ARREL: Una clau de registre predefinida. Això ha de ser una de les\n" +" següents:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subclau: El camí complet a una clau de registre sota una clau ARREL\n" +" donada.\n" +"\n" +" /v <nom_de_valor>\n" +" El nom del valor de registre a suprimir.\n" +"\n" +" /ve\n" +" Suprimeix un valor de registre sense nom. Aquesta opció suprimeix el\n" +" valor de registre (Default).\n" +"\n" +" /va\n" +" Suprimeix tots els valors d'una clau de registre.\n" +"\n" +" /f\n" +" Suprimeix una clau de registre (incloent totes les subclaus i tots els\n" +" valors) sense demanar confirmació.\n" #: programs/reg/reg.rc:170 msgid "" @@ -16001,6 +15895,35 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <clau> <fitxer> [/y]\n" +"\n" +" Exporta una clau de registre especificada (incloent totes les subclaus i\n" +" valors) a un fitxer.\n" +"\n" +" <clau>\n" +" La clau de registre a exportar.\n" +"\n" +" Format: ARREL\\Subclau\n" +"\n" +" ARREL: Una clau de registre predefinida. Això ha de ser una de les\n" +" següents:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subclau: El camí complet a una clau de registre sota una clau ARREL\n" +" donada.\n" +"\n" +" <fitxer>\n" +" El nom i el camí del fitxer de registre que es crearà.\n" +" Aquest fitxer ha de tenir una extensió .reg.\n" +"\n" +" /y\n" +" Sobrescriu <fitxer> sense demanar confirmació.\n" +"\n" #: programs/reg/reg.rc:148 msgid "" @@ -16012,6 +15935,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <fitxer>\n" +"\n" +" Importa al registre claus, valors i dades d'un fitxer donat.\n" +"\n" +" <fitxer>\n" +" El nom i el camí del fitxer de registre a importar.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -16047,6 +15977,40 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <clau> [/v nom_de_valor | /ve] [/s]\n" +"\n" +" Consulta una clau de registre especificada i llista totes les subclaus\n" +" immediates, valors i dades dins aquella clau. Utilitzeu [/s] per a\n" +" consultar cada subclau recursivament.\n" +"\n" +" <clau>\n" +" La clau de registre a consultar.\n" +"\n" +" Format: ARREL\\Subclau\n" +"\n" +" ARREL: Una clau de registre predefinida. Això ha de ser una de les\n" +" següents:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subclau: El camí complet a una clau de registre sota una clau ARREL\n" +" donada.\n" +"\n" +" /v <nom_de_valor>\n" +" El nom del valor de registre a consultar. Si no s'especifica ni [/v]\n" +" ni [/ve], es llisten tots els valors sota <clau>.\n" +"\n" +" /ve\n" +" Consulta un valor de registre sense nom. Aquesta opció consulta el\n" +" valor de registre (Default).\n" +"\n" +" /s\n" +" Llista totes les entrades sota <clau> i les seves subclaus.\n" +"\n" #: programs/reg/reg.rc:180 msgid "" @@ -16057,32 +16021,32 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" Accedir al registre utilitzant la perspectiva de 32 bits.\n" +"\n" +" /reg:64\n" +" Accedir al registre utilitzant la perspectiva de 64 bits.\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: Nom de clau no vàlid\n" +msgstr "reg: Clau de registre no vàlida\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg: No s'ha pogut accedir a la màquina remota\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: Nom de clau de sistema no vàlid [%1]\n" +msgstr "reg: Clau de sistema no vàlida\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: L'opció [%1] no és vàlida. " #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg: Un valor hexadecimal vàlid ha de seguir l'opció [/d]\n" +msgstr "reg: Un valor numèric vàlid ha de seguir l'opció [/d]\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" @@ -16110,15 +16074,15 @@ msgstr "reg: Paràmetres de línia d'ordres no vàlids\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: Les claus d'origen i de destinació no poden ser la mateixa\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "El fitxer '%1' ja existeix. El voleu sobreescriure?" +msgstr "" +"El valor '%1\\%2' ja existeix en la clau de destinació. El voleu " +"sobreescriure?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" @@ -16133,10 +16097,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Esteu segur que voleu suprimir la clau de registre '%1'?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: No s'ha pogut suprimir la clau de registre '%1'.\n" +msgstr "reg: No s'ha pogut suprimir tots els valors de registre en '%1'\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -16147,10 +16109,8 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Seqüència d'escapada no reconeguda [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "reg: No s'ha pogut obrir la clau de registre '%1'.\n" +msgstr "reg: No s'ha pogut importar la clau de registre '%1'\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -16843,37 +16803,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: S'ha desinstal·lat el DLL '%1' amb èxit\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16931,6 +16860,7 @@ msgstr "" " el seu codi de sortida.\n" "/unix Utilitza un nom de fitxer d'Unix i inicia el fitxer com\n" " el Windows Explorer.\n" +"/exec Executa el fitxer especificat (per a ús intern del Wine).\n" "/ProgIDOpen Obre un document utilitzant el progID especificat.\n" "/? Mostra aquesta ajuda i surt.\n" @@ -17531,7 +17461,7 @@ msgstr "Mostra les tasques utilitzant icones petites" #: programs/taskmgr/taskmgr.rc:195 msgid "Displays information about each task" -msgstr "Mosta informació sobre cada tasca" +msgstr "Mostra informació quant a cada tasca" #: programs/taskmgr/taskmgr.rc:196 msgid "Updates the display twice per second" @@ -18551,7 +18481,7 @@ msgid "" msgstr "" "Això pot ser causat per un problema en el programa o una deficiència en el " "Wine. Potser voleu comprovar la <a href=\"https://appdb.winehq.org\">base de " -"dades d'aplicacions</a> per suggeriments sobre l'execució d'aquesta " +"dades d'aplicacions</a> per suggeriments quant a l'execució d'aquesta " "aplicació." #: programs/winedbg/winedbg.rc:62 @@ -19480,7 +19410,7 @@ msgstr "" "[/S] Copia els directoris i subdirectoris.\n" "[/E] Copia els directoris i subdirectoris, incloent-hi els buits.\n" "[/Q] No mostris els noms durant la còpia, és a dir, sigues silent.\n" -"[/F] Mostra els noms complets de la font i la destinació durant la còpia.\n" +"[/F] Mostra els noms complets de l'origen i la destinació durant la còpia.\n" "[/L] Simula l'operació, mostrant els noms que es copiarien.\n" "[/W] Pregunta abans de començar l'operació de còpia.\n" "[/T] Crea una estructura de directoris buits però no copiïs els fitxers.\n" -- 2.34.1

1 0

[PATCH 1/2] ole32: Fix memory leak on error path in CompositeMonikerImpl_CommonPrefixWith (Coverity)
by Alex Henrie 29 Dec '21

29 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ole32/compositemoniker.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index a94e4734f45..05901bb52b3 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -751,7 +751,11 @@ static HRESULT WINAPI CompositeMonikerImpl_CommonPrefixWith(IMoniker *iface, IMo heap_free(components); heap_free(other_components); - if (!prefix_len) return MK_E_NOPREFIX; + if (!prefix_len) + { + heap_free(prefix_components); + return MK_E_NOPREFIX; + } last = prefix_components[0]; for (i = 1; i < prefix_len; ++i) -- 2.34.1

1 1

[PATCH] widl: Fix including tlb files in mingw-w64-tools configuration.
by Martin Storsjö 28 Dec '21

28 Dec '21

Prior to c94f44f9b4559351c0ca86d344fe37aabc15200c (widl: Search for imported typelibs in the library search path.), widl looked for tlb files in the path specified by BIN_TO_INCLUDEDIR. After that commit, widl looks for tlb files in a subdirectory (get_pe_dir) of BIN_TO_DLLDIR (which mingw-w64 sets to the same as BIN_TO_INCLUDEDIR). For compatibility with the mingw-w64 usecase, check for tlb files in the directory specified by BIN_TO_DLLDIR without a separate subdirectory suffix too. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- tools/widl/widl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 0b5f07236f0..f696a73bd2f 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -698,7 +698,11 @@ int open_typelib( const char *name ) if (stdinc) { - if (dlldir) TRYOPEN( strmake( "%s%s/%s", dlldir, pe_dir, name )); + if (dlldir) + { + TRYOPEN( strmake( "%s%s/%s", dlldir, pe_dir, name )); + TRYOPEN( strmake( "%s/%s", dlldir, name )); + } for (i = 0; i < ARRAY_SIZE(default_dirs); i++) { if (i && !strcmp( default_dirs[i], default_dirs[0] )) continue; -- 2.25.1

1 0

[PATCH 1/2] kernel32/tests: Don't test functions directly when reporting GetLastError()
by André Zwing 28 Dec '21

28 Dec '21

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/kernel32/tests/locale.c | 68 +++++++++++++++--------------------- 1 file changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d64a08666f8..2d327b7130c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7048,22 +7048,19 @@ static BOOL CALLBACK calinfo_procA(LPSTR calinfo) static void test_EnumCalendarInfoA(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoA( calinfo_procA, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoA for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoA( calinfo_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoA for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoA( calinfo_procA, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoA( calinfo_procA, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoA for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7076,22 +7073,19 @@ static BOOL CALLBACK calinfo_procW(LPWSTR calinfo) static void test_EnumCalendarInfoW(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoW( calinfo_procW, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoW for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoW( calinfo_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoW for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoW( calinfo_procW, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoW( calinfo_procW, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoW for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7105,22 +7099,19 @@ static BOOL CALLBACK calinfoex_procA(LPSTR calinfo, LCID calid) static void test_EnumCalendarInfoExA(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoExA( calinfoex_procA, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoExA for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoExA( calinfoex_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoExA for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoExA( calinfoex_procA, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoExA( calinfoex_procA, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoExA for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7134,22 +7125,19 @@ static BOOL CALLBACK calinfoex_procW(LPWSTR calinfo, LCID calid) static void test_EnumCalendarInfoExW(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoExW( calinfoex_procW, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoExW for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoExW( calinfoex_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoExW for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoExW( calinfoex_procW, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoExW( calinfoex_procW, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoExW for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } -- 2.25.1

1 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel