- Wine-Devel - list.winehq.org

[PATCH] dlls/user32/tests/winstation.c: enable compilation with long types
by Eric Pouech March 17, 2022

March 17, 2022

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/user32/tests/winstation.c | 159 ++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 79 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 9899b6c7f7b..80bd33f9f9f 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef WINE_NO_LONG_TYPES /* temporary for migration */ #include "wine/test.h" #include "winbase.h" @@ -81,11 +82,11 @@ static DWORD CALLBACK thread( LPVOID arg ) SetLastError( 0xdeadbeef ); ok( !CloseHandle( d1 ), "CloseHandle succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %d\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %ld\n", GetLastError() ); SetLastError( 0xdeadbeef ); ok( !CloseDesktop( d1 ), "CloseDesktop succeeded\n" ); ok( GetLastError() == ERROR_BUSY || broken(GetLastError() == 0xdeadbeef), /* wow64 */ - "bad last error %d\n", GetLastError() ); + "bad last error %ld\n", GetLastError() ); print_object( d1 ); d2 = CreateDesktopA( "foobar2", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); trace( "created desktop %p\n", d2 ); @@ -94,7 +95,7 @@ static DWORD CALLBACK thread( LPVOID arg ) SetLastError( 0xdeadbeef ); ok( !SetThreadDesktop( d2 ), "set thread desktop succeeded with existing window\n" ); ok( GetLastError() == ERROR_BUSY || broken(GetLastError() == 0xdeadbeef), /* wow64 */ - "bad last error %d\n", GetLastError() ); + "bad last error %ld\n", GetLastError() ); DestroyWindow( hwnd ); ok( SetThreadDesktop( d2 ), "set thread desktop failed\n" ); @@ -130,7 +131,7 @@ static void test_handles(void) ok( !CloseWindowStation(w1), "closing process win station succeeded\n" ); SetLastError( 0xdeadbeef ); ok( !CloseHandle(w1), "closing process win station handle succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %d\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %ld\n", GetLastError() ); print_object( w1 ); flags = 0; @@ -149,14 +150,14 @@ static void test_handles(void) w2 = CreateWindowStationA("WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); le = GetLastError(); - ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", le ); + ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%lu)\n", le ); if (w2 != 0) { ok( w2 != w1, "CreateWindowStation returned default handle\n" ); SetLastError( 0xdeadbeef ); ok( !CloseDesktop( (HDESK)w2 ), "CloseDesktop succeeded on win station\n" ); ok( GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == 0xdeadbeef), /* wow64 */ - "bad last error %d\n", GetLastError() ); + "bad last error %ld\n", GetLastError() ); ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); w2 = CreateWindowStationA("WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); @@ -176,7 +177,7 @@ static void test_handles(void) CreateMutexA( NULL, 0, "foobar" ); w2 = CreateWindowStationA("foobar", 0, WINSTA_ALL_ACCESS, NULL ); le = GetLastError(); - ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "create foobar station failed (%u)\n", le ); + ok( w2 != 0 || le == ERROR_ACCESS_DENIED, "create foobar station failed (%lu)\n", le ); if (w2 != 0) { @@ -216,35 +217,35 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); w2 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); ok( !w2, "open station succeeded\n" ); - ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); w2 = CreateWindowStationA( "", 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "create station failed err %u\n", GetLastError() ); + ok( w2 != 0, "create station failed err %lu\n", GetLastError() ); memset( buffer, 0, sizeof(buffer) ); ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); - ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); + ok( ret, "GetUserObjectInformationA failed with error %lu\n", GetLastError() ); /* Get the logon session LUID */ ret = GetTokenInformation( GetCurrentProcessToken(), TokenStatistics, &token_stats, sizeof(token_stats), NULL ); if (ret) - sprintf( default_name, "Service-0x%x-%x$", token_stats.AuthenticationId.HighPart, + sprintf( default_name, "Service-0x%lx-%lx$", token_stats.AuthenticationId.HighPart, token_stats.AuthenticationId.LowPart ); if (*default_name) ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name ); SetLastError( 0xdeadbeef ); w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); - ok( w3 != 0, "open station failed err %u\n", GetLastError() ); + ok( w3 != 0, "open station failed err %lu\n", GetLastError() ); CloseWindowStation( w3 ); CloseWindowStation( w2 ); w2 = CreateWindowStationA( NULL, 0, WINSTA_ALL_ACCESS, NULL ); - ok( w2 != 0, "create station failed err %u\n", GetLastError() ); + ok( w2 != 0, "create station failed err %lu\n", GetLastError() ); memset( buffer, 0, sizeof(buffer) ); ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); - ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); + ok( ret, "GetUserObjectInformationA failed with error %lu\n", GetLastError() ); if (*default_name) ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name ); CloseWindowStation( w2 ); @@ -253,12 +254,12 @@ static void test_handles(void) w2 = CreateWindowStationA( "foo\\bar", 0, WINSTA_ALL_ACCESS, NULL ); ok( !w2, "create station succeeded\n" ); ok( GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_ACCESS_DENIED, - "wrong error %u\n", GetLastError() ); + "wrong error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); w2 = OpenWindowStationA( "foo\\bar", TRUE, WINSTA_ALL_ACCESS ); ok( !w2, "create station succeeded\n" ); - ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %lu\n", GetLastError() ); /* desktops */ d1 = GetThreadDesktop(GetCurrentThreadId()); @@ -273,7 +274,7 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); ok( !CloseDesktop(d1), "closing thread desktop succeeded\n" ); ok( GetLastError() == ERROR_BUSY || broken(GetLastError() == 0xdeadbeef), /* wow64 */ - "bad last error %d\n", GetLastError() ); + "bad last error %ld\n", GetLastError() ); SetLastError( 0xdeadbeef ); if (CloseHandle( d1 )) /* succeeds on nt4 */ @@ -281,7 +282,7 @@ static void test_handles(void) win_skip( "NT4 desktop handle management is completely different\n" ); return; } - ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %d\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %ld\n", GetLastError() ); ok( DuplicateHandle( GetCurrentProcess(), d1, GetCurrentProcess(), (PHANDLE)&d2, 0, TRUE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" ); @@ -297,34 +298,34 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); d2 = CreateDesktopA( "", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); ok( !d2, "create empty desktop succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); d2 = OpenDesktopA( "", 0, TRUE, DESKTOP_ALL_ACCESS ); ok( !d2, "open empty desktop succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); d2 = CreateDesktopA( "foo\\bar", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); ok( !d2, "create desktop succeeded\n" ); - ok( GetLastError() == ERROR_BAD_PATHNAME, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_BAD_PATHNAME, "wrong error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); d2 = OpenDesktopA( "foo\\bar", 0, TRUE, DESKTOP_ALL_ACCESS ); ok( !d2, "open desktop succeeded\n" ); - ok( GetLastError() == ERROR_BAD_PATHNAME, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_BAD_PATHNAME, "wrong error %lu\n", GetLastError() ); d2 = CreateDesktopA( "foobar", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); ok( d2 != 0, "create foobar desktop failed\n" ); SetLastError( 0xdeadbeef ); ok( !CloseWindowStation( (HWINSTA)d2 ), "CloseWindowStation succeeded on desktop\n" ); ok( GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == 0xdeadbeef), /* wow64 */ - "bad last error %d\n", GetLastError() ); + "bad last error %ld\n", GetLastError() ); SetLastError( 0xdeadbeef ); d3 = CreateDesktopA( "foobar", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); ok( d3 != 0, "create foobar desktop again failed\n" ); - ok( GetLastError() == 0xdeadbeef, "bad last error %d\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "bad last error %ld\n", GetLastError() ); ok( CloseDesktop( d3 ), "CloseDesktop failed\n" ); d3 = OpenDesktopA( "foobar", 0, TRUE, DESKTOP_ALL_ACCESS ); @@ -383,12 +384,12 @@ static void test_enumstations(void) SetLastError(0xbabefeed); ret = EnumWindowStationsA(NULL, 0); ok(!ret, "EnumWindowStationsA returned successfully!\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08x\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08lx\n", GetLastError()); } hwinsta = CreateWindowStationA("winsta_test", 0, WINSTA_ALL_ACCESS, NULL); ret = GetLastError(); - ok(hwinsta != NULL || ret == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", ret); + ok(hwinsta != NULL || ret == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%lu)\n", ret); if (!hwinsta) { win_skip("Not enough privileges for CreateWindowStation\n"); @@ -397,13 +398,13 @@ static void test_enumstations(void) SetLastError(0xdeadbeef); ret = EnumWindowStationsA(open_window_station_callbackA, 0x12345); - ok(ret == 0x12345, "EnumWindowStationsA returned %x\n", ret); - ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + ok(ret == 0x12345, "EnumWindowStationsA returned %lx\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = EnumWindowStationsA(window_station_callbackA, 0); - ok(!ret, "EnumWindowStationsA returned %x\n", ret); - ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + ok(!ret, "EnumWindowStationsA returned %lx\n", ret); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError()); } static BOOL CALLBACK desktop_callbackA(LPSTR desktop, LPARAM lp) @@ -438,28 +439,28 @@ static void test_enumdesktops(void) SetLastError(0xbabefeed); ret = EnumDesktopsA(GetProcessWindowStation(), NULL, 0); ok(!ret, "EnumDesktopsA returned successfully!\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08x\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "LastError is set to %08lx\n", GetLastError()); } SetLastError(0xdeadbeef); ret = EnumDesktopsA(NULL, desktop_callbackA, 0x12345); ok(ret == 0x12345, "EnumDesktopsA returned %x\n", ret); - ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = EnumDesktopsA(GetProcessWindowStation(), open_desktop_callbackA, 0x12345); ok(ret == 0x12345, "EnumDesktopsA returned %x\n", ret); - ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = EnumDesktopsA(INVALID_HANDLE_VALUE, desktop_callbackA, 0x12345); ok(!ret, "EnumDesktopsA returned %x\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, "LastError is set to %08x\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "LastError is set to %08lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = EnumDesktopsA(GetProcessWindowStation(), desktop_callbackA, 0); ok(!ret, "EnumDesktopsA returned %x\n", ret); - ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError()); } /* Miscellaneous tests */ @@ -489,8 +490,8 @@ static void test_getuserobjectinformation(void) ret = GetUserObjectInformationA(desk, UOI_NAME, NULL, 0, &size); ok(!ret, "GetUserObjectInformationA returned %x\n", ret); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); - ok(size == 22, "size is set to %d\n", size); /* Windows returns Unicode length (11*2) */ + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08lx\n", GetLastError()); + ok(size == 22, "size is set to %ld\n", size); /* Windows returns Unicode length (11*2) */ /* Get string */ SetLastError(0xdeadbeef); @@ -498,10 +499,10 @@ static void test_getuserobjectinformation(void) ret = GetUserObjectInformationA(desk, UOI_NAME, buffer, sizeof(buffer), &size); ok(ret, "GetUserObjectInformationA returned %x\n", ret); - ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError()); ok(strcmp(buffer, "foobarTest") == 0, "Buffer is set to '%s'\n", buffer); - ok(size == 11, "size is set to %d\n", size); /* 11 bytes in 'foobarTest\0' */ + ok(size == 11, "size is set to %ld\n", size); /* 11 bytes in 'foobarTest\0' */ /* Get size, test size and return value/error code (Unicode) */ SetLastError(0xdeadbeef); @@ -509,8 +510,8 @@ static void test_getuserobjectinformation(void) ret = GetUserObjectInformationW(desk, UOI_NAME, NULL, 0, &size); ok(!ret, "GetUserObjectInformationW returned %x\n", ret); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); - ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08lx\n", GetLastError()); + ok(size == 22, "size is set to %ld\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ /* Get string (Unicode) */ SetLastError(0xdeadbeef); @@ -518,15 +519,15 @@ static void test_getuserobjectinformation(void) ret = GetUserObjectInformationW(desk, UOI_NAME, bufferW, sizeof(bufferW), &size); ok(ret, "GetUserObjectInformationW returned %x\n", ret); - ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError()); ok(lstrcmpW(bufferW, foobarTestW + 1) == 0, "Buffer is not set to 'foobarTest'\n"); - ok(size == 22, "size is set to %d\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ + ok(size == 22, "size is set to %ld\n", size); /* 22 bytes in 'foobarTest\0' in Unicode */ /* ObjectNameInformation does not return the full desktop name */ name_info = (OBJECT_NAME_INFORMATION *)buffer; status = pNtQueryObject(desk, ObjectNameInformation, name_info, sizeof(buffer), NULL); - ok(!status, "expected STATUS_SUCCESS, got %08x\n", status); + ok(!status, "expected STATUS_SUCCESS, got %08lx\n", status); ok(lstrcmpW(name_info->Name.Buffer, foobarTestW) == 0, "expected '\\foobarTest', got %s\n", wine_dbgstr_w(name_info->Name.Buffer)); @@ -538,8 +539,8 @@ static void test_getuserobjectinformation(void) ret = GetUserObjectInformationA(desk, UOI_TYPE, NULL, 0, &size); ok(!ret, "GetUserObjectInformationA returned %x\n", ret); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); - ok(size == 16, "size is set to %d\n", size); /* Windows returns Unicode length (8*2) */ + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08lx\n", GetLastError()); + ok(size == 16, "size is set to %ld\n", size); /* Windows returns Unicode length (8*2) */ /* Get string */ SetLastError(0xdeadbeef); @@ -547,10 +548,10 @@ static void test_getuserobjectinformation(void) ret = GetUserObjectInformationA(desk, UOI_TYPE, buffer, sizeof(buffer), &size); ok(ret, "GetUserObjectInformationA returned %x\n", ret); - ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError()); ok(strcmp(buffer, "Desktop") == 0, "Buffer is set to '%s'\n", buffer); - ok(size == 8, "size is set to %d\n", size); /* 8 bytes in 'Desktop\0' */ + ok(size == 8, "size is set to %ld\n", size); /* 8 bytes in 'Desktop\0' */ /* Get size, test size and return value/error code (Unicode) */ size = 0xdeadbeef; @@ -558,8 +559,8 @@ static void test_getuserobjectinformation(void) ret = GetUserObjectInformationW(desk, UOI_TYPE, NULL, 0, &size); ok(!ret, "GetUserObjectInformationW returned %x\n", ret); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); - ok(size == 16, "size is set to %d\n", size); /* 16 bytes in 'Desktop\0' in Unicode */ + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08lx\n", GetLastError()); + ok(size == 16, "size is set to %ld\n", size); /* 16 bytes in 'Desktop\0' in Unicode */ /* Get string (Unicode) */ SetLastError(0xdeadbeef); @@ -567,10 +568,10 @@ static void test_getuserobjectinformation(void) ret = GetUserObjectInformationW(desk, UOI_TYPE, bufferW, sizeof(bufferW), &size); ok(ret, "GetUserObjectInformationW returned %x\n", ret); - ok(GetLastError() == 0xdeadbeef, "LastError is set to %08x\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "LastError is set to %08lx\n", GetLastError()); ok(lstrcmpW(bufferW, DesktopW) == 0, "Buffer is not set to 'Desktop'\n"); - ok(size == 16, "size is set to %d\n", size); /* 16 bytes in 'Desktop\0' in Unicode */ + ok(size == 16, "size is set to %ld\n", size); /* 16 bytes in 'Desktop\0' in Unicode */ ok(CloseDesktop(desk), "CloseDesktop failed\n"); } @@ -615,8 +616,8 @@ static void test_inputdesktop(void) SetLastError(0xdeadbeef); ret = SendInput(1, inputs, sizeof(INPUT)); - ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); - ok(ret == 1, "unexpected return count %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "unexpected last error %08lx\n", GetLastError()); + ok(ret == 1, "unexpected return count %ld\n", ret); /* Set thread desktop to the new desktop, SendInput should fail. */ new_desk = CreateDesktopA("new_desk", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); @@ -641,8 +642,8 @@ static void test_inputdesktop(void) return; } todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08x\n", GetLastError()); - ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %d\n", ret); + ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08lx\n", GetLastError()); + ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %ld\n", ret); /* Set thread desktop back to the old thread desktop, SendInput should success. */ ret = SetThreadDesktop(old_thread_desk); @@ -655,8 +656,8 @@ static void test_inputdesktop(void) SetLastError(0xdeadbeef); ret = SendInput(1, inputs, sizeof(INPUT)); - ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); - ok(ret == 1, "unexpected return count %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "unexpected last error %08lx\n", GetLastError()); + ok(ret == 1, "unexpected return count %ld\n", ret); /* Set thread desktop to the input desktop, SendInput should success. */ ret = SetThreadDesktop(old_input_desk); @@ -669,8 +670,8 @@ static void test_inputdesktop(void) SetLastError(0xdeadbeef); ret = SendInput(1, inputs, sizeof(INPUT)); - ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); - ok(ret == 1, "unexpected return count %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "unexpected last error %08lx\n", GetLastError()); + ok(ret == 1, "unexpected return count %ld\n", ret); /* Switch input desktop to the new desktop, SendInput should fail. */ ret = SwitchDesktop(new_desk); @@ -689,8 +690,8 @@ static void test_inputdesktop(void) SetLastError(0xdeadbeef); ret = SendInput(1, inputs, sizeof(INPUT)); todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08x\n", GetLastError()); - ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %d\n", ret); + ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08lx\n", GetLastError()); + ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %ld\n", ret); /* Set thread desktop to the new desktop, SendInput should success. */ ret = SetThreadDesktop(new_desk); @@ -703,8 +704,8 @@ static void test_inputdesktop(void) SetLastError(0xdeadbeef); ret = SendInput(1, inputs, sizeof(INPUT)); - ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); - ok(ret == 1, "unexpected return count %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "unexpected last error %08lx\n", GetLastError()); + ok(ret == 1, "unexpected return count %ld\n", ret); /* Switch input desktop to the old input desktop, set thread desktop to the old * thread desktop, clean side effects. SendInput should success. */ @@ -727,8 +728,8 @@ static void test_inputdesktop(void) SetLastError(0xdeadbeef); ret = SendInput(1, inputs, sizeof(INPUT)); - ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); - ok(ret == 1, "unexpected return count %d\n", ret); + ok(GetLastError() == 0xdeadbeef, "unexpected last error %08lx\n", GetLastError()); + ok(ret == 1, "unexpected return count %ld\n", ret); /* free resources */ ret = CloseDesktop(input_desk); @@ -752,7 +753,7 @@ static void test_inputdesktop2(void) SetLastError(0xdeadbeef); w2 = CreateWindowStationA("winsta_test", 0, WINSTA_ALL_ACCESS, NULL); ret = GetLastError(); - ok(w2 != NULL || ret == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%u)\n", ret); + ok(w2 != NULL || ret == ERROR_ACCESS_DENIED, "CreateWindowStation failed (%lu)\n", ret); if (!w2) { win_skip("Not enough privileges for CreateWindowStation\n"); @@ -780,7 +781,7 @@ static void test_inputdesktop2(void) SetLastError(0xdeadbeef); input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); ok(input_desk == NULL, "OpenInputDesktop should fail on non default winstation!\n"); - ok(GetLastError() == ERROR_INVALID_FUNCTION || broken(GetLastError() == 0xdeadbeef), "last error %08x\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_FUNCTION || broken(GetLastError() == 0xdeadbeef), "last error %08lx\n", GetLastError()); hdesk = OpenDesktopA("desk_test", 0, TRUE, DESKTOP_ALL_ACCESS); ok(hdesk != NULL, "OpenDesktop failed!\n"); @@ -789,7 +790,7 @@ static void test_inputdesktop2(void) todo_wine ok(!ret, "Switch to desktop belong to non default winstation should fail!\n"); todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == 0xdeadbeef), "last error %08x\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED || broken(GetLastError() == 0xdeadbeef), "last error %08lx\n", GetLastError()); ret = SetThreadDesktop(hdesk); ok(ret, "SetThreadDesktop failed!\n"); @@ -860,17 +861,17 @@ static DWORD set_foreground(HWND hwnd) GetWindowTextA(hwnd_fore, win_text, 1024); set_id = GetWindowThreadProcessId(hwnd, NULL); fore_id = GetWindowThreadProcessId(hwnd_fore, NULL); - trace("\"%s\" %p %08x hwnd %p %08x\n", win_text, hwnd_fore, fore_id, hwnd, set_id); + trace("\"%s\" %p %08lx hwnd %p %08lx\n", win_text, hwnd_fore, fore_id, hwnd, set_id); ret = AttachThreadInput(set_id, fore_id, TRUE); - trace("AttachThreadInput returned %08x\n", ret); + trace("AttachThreadInput returned %08lx\n", ret); ret = ShowWindow(hwnd, SW_SHOWNORMAL); - trace("ShowWindow returned %08x\n", ret); + trace("ShowWindow returned %08lx\n", ret); ret = SetWindowPos(hwnd, HWND_TOPMOST, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE); - trace("set topmost returned %08x\n", ret); + trace("set topmost returned %08lx\n", ret); ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE); - trace("set notopmost returned %08x\n", ret); + trace("set notopmost returned %08lx\n", ret); ret = SetForegroundWindow(hwnd); - trace("SetForegroundWindow returned %08x\n", ret); + trace("SetForegroundWindow returned %08lx\n", ret); Sleep(250); AttachThreadInput(set_id, fore_id, FALSE); return ret; @@ -899,7 +900,7 @@ static void test_foregroundwindow(void) SetLastError(0xdeadbeef); hdesks[1] = CreateDesktopA("desk2", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); ret = GetLastError(); - ok(hdesks[1] != NULL || ret == ERROR_ACCESS_DENIED, "CreateDesktop failed (%u)\n", ret); + ok(hdesks[1] != NULL || ret == ERROR_ACCESS_DENIED, "CreateDesktop failed (%lu)\n", ret); if(!hdesks[1]) { win_skip("Not enough privileges for CreateDesktop\n"); @@ -913,13 +914,13 @@ static void test_foregroundwindow(void) CloseDesktop(hdesks[1]); return; } - trace("old timeout %d\n", timeout_old); + trace("old timeout %ld\n", timeout_old); timeout = 0; ret = SystemParametersInfoA(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); ok(ret, "set foreground lock timeout failed!\n"); ret = SystemParametersInfoA(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout, 0); ok(ret, "get foreground lock timeout failed!\n"); - ok(timeout == 0, "unexpected timeout %d\n", timeout); + ok(timeout == 0, "unexpected timeout %ld\n", timeout); for (thread_desk_id = 0; thread_desk_id < DESKTOPS; thread_desk_id++) { @@ -1011,7 +1012,7 @@ static void test_foregroundwindow(void) ok(ret, "set foreground lock timeout failed!\n"); ret = SystemParametersInfoA(SPI_GETFOREGROUNDLOCKTIMEOUT, 0, &timeout, 0); ok(ret, "get foreground lock timeout failed!\n"); - ok(timeout == timeout_old, "unexpected timeout %d\n", timeout); + ok(timeout == timeout_old, "unexpected timeout %ld\n", timeout); } START_TEST(winstation)

1 0

[PATCH 1/4] winedbg: Set thread->name from MSVC exception when in GDB proxy mode.
by Brendan Shanks March 17, 2022

March 17, 2022

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/winedbg/gdbproxy.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0268a288481..bcde120adeb 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -482,7 +482,6 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e { const THREADNAME_INFO *threadname = (const THREADNAME_INFO *)rec->ExceptionInformation; struct dbg_thread *thread; - char name[9]; SIZE_T read; if (threadname->dwType != 0x1000) @@ -494,10 +493,12 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e if (thread) { if (gdbctx->process->process_io->read( gdbctx->process->handle, - threadname->szName, name, sizeof(name), &read) && read == sizeof(name)) + threadname->szName, thread->name, sizeof(thread->name), &read) && + read == sizeof(thread->name)) { - fprintf(stderr, "Thread ID=%04lx renamed to \"%.9s\"\n", - threadname->dwThreadID, name); + thread->name[sizeof(thread->name) - 1] = '\0'; + fprintf(stderr, "Thread ID=%04lx renamed to \"%s\"\n", + threadname->dwThreadID, thread->name); } } else -- 2.34.1

2 7

[PATCH 1/6] mfplat/tests: Check that Lock() and Lock2D() see the same content.
by Giovanni Mascellani March 17, 2022

March 17, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 83877041694..7e72abbde22 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5725,6 +5725,8 @@ static void test_MFCreate2DMediaBuffer(void) { 1, 4, D3DFMT_A8R8G8B8, 16, 64 }, { 4, 1, D3DFMT_A8R8G8B8, 16, 64 }, }; + static const char two_aas[] = { 0xaa, 0xaa }; + static const char eight_bbs[] = { 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb }; DWORD max_length, length, length2; BYTE *buffer_start, *data, *data2; LONG pitch, pitch2, stride; @@ -5783,6 +5785,8 @@ static void test_MFCreate2DMediaBuffer(void) ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); ok(max_length == length, "Unexpected length.\n"); + memset(data, 0xaa, length); + length = 0; pMFGetPlaneSize(MAKEFOURCC('N','V','1','2'), 2, 3, &length); ok(max_length == length && length == 9, "Unexpected length %lu.\n", length); @@ -5835,6 +5839,10 @@ static void test_MFCreate2DMediaBuffer(void) ok(!!data, "Expected data pointer.\n"); ok(pitch == 64, "Unexpected pitch %ld.\n", pitch); + for (i = 0; i < 4; i++) + ok(memcmp(&data[64 * i], two_aas, sizeof(two_aas)) == 0, "Invalid data instead of 0xaa.\n"); + memset(data, 0xbb, 194); + hr = IMF2DBuffer_Lock2D(_2dbuffer, &data2, &pitch); ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); ok(data == data2, "Expected data pointer.\n"); @@ -5861,6 +5869,15 @@ static void test_MFCreate2DMediaBuffer(void) hr = IMF2DBuffer_Unlock2D(_2dbuffer); ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#lx.\n", hr); + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Failed to lock buffer, hr %#lx.\n", hr); + + todo_wine + ok(memcmp(data, eight_bbs, sizeof(eight_bbs)) == 0, "Invalid data instead of 0xbb.\n"); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock buffer, hr %#lx.\n", hr); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&_2dbuffer2); ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Failed to get interface, hr %#lx.\n", hr); -- 2.35.1

2 11

[PATCH] po: Update Catalan translation
by Alex Henrie March 17, 2022

March 17, 2022

Fitting the translated timezone names in 31 characters is a challenge. To save space, I expressed all of them in the format "[<region>, ]<zone>[, <season>]". This format has the additional small benefit of sorting similarly to the original English strings. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 682 ++++++++++++++++++++++--------------------------------- 1 file changed, 272 insertions(+), 410 deletions(-) diff --git a/po/ca.po b/po/ca.po index 7a5e102cb89..f87187f0161 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: 2021-12-28 21:33-0700\n" +"PO-Revision-Date: 2022-03-16 22:20-0600\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 3.0\n" +"X-Generator: Poedit 3.0.1\n" #: dlls/aclui/aclui.rc:29 dlls/inetcpl.cpl/inetcpl.rc:90 #: programs/winefile/winefile.rc:114 @@ -6976,54 +6976,40 @@ msgid "This network connection does not exist.\n" msgstr "Aquesta connexió de xarxa no existeix.\n" #: dlls/kernel32/winerror.mc:3748 -#, fuzzy -#| msgid "Invalid at interrupt time.\n" msgid "Call interrupted.\n" -msgstr "No era vàlid a l'hora d'interrupció.\n" +msgstr "S'ha interromput la trucada.\n" #: dlls/kernel32/winerror.mc:3753 -#, fuzzy -#| msgid "Invalid handle.\n" msgid "Invalid file handle.\n" -msgstr "L'identificador no és vàlid.\n" +msgstr "L'identificador de fitxer no és vàlid.\n" #: dlls/kernel32/winerror.mc:3763 -#, fuzzy -#| msgid "Invalid network address.\n" msgid "Invalid pointer address.\n" -msgstr "L'adreça de xarxa no és vàlida.\n" +msgstr "L'identificador de punter no és vàlid.\n" #: dlls/kernel32/winerror.mc:3768 -#, fuzzy -#| msgid "Invalid name.\n" msgid "Invalid argument.\n" -msgstr "El nom no és vàlid.\n" +msgstr "L'argument no és vàlid.\n" #: dlls/kernel32/winerror.mc:3778 msgid "Connection reset by peer.\n" msgstr "Un igual ha restablert la connexió.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "Point not found.\n" msgid "Host not found.\n" -msgstr "No s'ha trobat el punt.\n" +msgstr "No s'ha trobat l'amfitrió.\n" #: dlls/kernel32/winerror.mc:3793 -#, fuzzy -#| msgid "Attribute is not found.\n" msgid "Nonauthoritative host not found.\n" -msgstr "No s'ha trobat l'atribut.\n" +msgstr "No s'ha trobat l'amfitrió no autoritzat.\n" #: dlls/kernel32/winerror.mc:3798 -#, fuzzy -#| msgid "Unrecoverable error occurred.\n" msgid "Nonrecoverable error.\n" -msgstr "Ha ocorregut un error no recuperable.\n" +msgstr "No es pot recuperar de l'error.\n" #: dlls/kernel32/winerror.mc:3803 msgid "Name valid, no data record.\n" -msgstr "" +msgstr "El nom és vàlid però no hi ha dades.\n" #: dlls/kernel32/winerror.mc:3817 msgid "Not implemented.\n" @@ -10391,28 +10377,26 @@ msgstr "Seleccionar font" #: dlls/tzres/tzres.rc:126 msgctxt "maximum 31 characters" msgid "China Standard Time" -msgstr "Hora estàndard de la Xina" +msgstr "Xina, hora estàndard" #: dlls/tzres/tzres.rc:127 msgctxt "maximum 31 characters" msgid "China Daylight Time" -msgstr "Hora d'estiu de la Xina" +msgstr "Xina, hora d'estiu" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" msgstr "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" #: dlls/tzres/tzres.rc:267 -#, fuzzy -#| msgid "North Asia Standard Time" msgctxt "maximum 31 characters" msgid "North Asia Standard Time" -msgstr "Hora estàndard de l'Àsia del Nord" +msgstr "Àsia del nord, hora estàndard" #: dlls/tzres/tzres.rc:268 msgctxt "maximum 31 characters" msgid "North Asia Daylight Time" -msgstr "Hora d'estiu de l'Àsia del Nord" +msgstr "Àsia del nord, hora d'estiu" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" @@ -10421,12 +10405,12 @@ msgstr "(UTC+07:00) Krasnoiarsk" #: dlls/tzres/tzres.rc:168 msgctxt "maximum 31 characters" msgid "Georgian Standard Time" -msgstr "Hora estàndard de Geòrgia" +msgstr "Geòrgia, hora estàndard" #: dlls/tzres/tzres.rc:169 msgctxt "maximum 31 characters" msgid "Georgian Daylight Time" -msgstr "Hora d'estiu de Geòrgia" +msgstr "Geòrgia, hora d'estiu" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" @@ -10444,12 +10428,12 @@ msgstr "(UTC+12:00) Temps universal coordinat+12" #: dlls/tzres/tzres.rc:252 msgctxt "maximum 31 characters" msgid "Nepal Standard Time" -msgstr "Hora estàndard del Nepal" +msgstr "Nepal, hora estàndard" #: dlls/tzres/tzres.rc:253 msgctxt "maximum 31 characters" msgid "Nepal Daylight Time" -msgstr "Hora d'estiu del Nepal" +msgstr "Nepal, hora d'estiu" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" @@ -10458,12 +10442,12 @@ msgstr "(UTC+05:45) Katmandú" #: dlls/tzres/tzres.rc:90 msgctxt "maximum 31 characters" msgid "Cape Verde Standard Time" -msgstr "Hora estàndard de Cap Verd" +msgstr "Cap Verd, hora estàndard" #: dlls/tzres/tzres.rc:91 msgctxt "maximum 31 characters" msgid "Cape Verde Daylight Time" -msgstr "Hora d'estiu de Cap Verd" +msgstr "Cap Verd, hora d'estiu" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." @@ -10472,30 +10456,26 @@ msgstr "(UTC-01:00) Illes del Cap Verd" #: dlls/tzres/tzres.rc:183 msgctxt "maximum 31 characters" msgid "Haiti Standard Time" -msgstr "Hora estàndard de Haití" +msgstr "Haití, hora estàndard" #: dlls/tzres/tzres.rc:184 msgctxt "maximum 31 characters" msgid "Haiti Daylight Time" -msgstr "Hora d'estiu de Haití" +msgstr "Haití, hora d'estiu" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" msgstr "(UTC-05:00) Haití" #: dlls/tzres/tzres.rc:111 -#, fuzzy -#| msgid "Central European Standard Time" msgctxt "maximum 31 characters" msgid "Central European Standard Time" -msgstr "Hora estàndard de l'Europa central" +msgstr "Europa, central, hora estàndard" #: dlls/tzres/tzres.rc:112 -#, fuzzy -#| msgid "Central European Daylight Time" msgctxt "maximum 31 characters" msgid "Central European Daylight Time" -msgstr "Hora d'estiu de l'Europa central" +msgstr "Europa, central, hora d'estiu" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" @@ -10504,12 +10484,12 @@ msgstr "(UTC+01:00) Sarajevo, Skopje, Varsòvia, Zagreb" #: dlls/tzres/tzres.rc:234 msgctxt "maximum 31 characters" msgid "Morocco Standard Time" -msgstr "Hora estàndard del Marroc" +msgstr "Marroc, hora estàndard" #: dlls/tzres/tzres.rc:235 msgctxt "maximum 31 characters" msgid "Morocco Daylight Time" -msgstr "Hora d'estiu del Marroc" +msgstr "Marroc, hora d'estiu" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" @@ -10527,30 +10507,26 @@ msgstr "(UTC-08:00) Temps universal coordinat-08" #: dlls/tzres/tzres.rc:39 msgctxt "maximum 31 characters" msgid "Altai Standard Time" -msgstr "Hora estàndard de l'Altai" +msgstr "Altai, hora estàndard" #: dlls/tzres/tzres.rc:40 msgctxt "maximum 31 characters" msgid "Altai Daylight Time" -msgstr "Hora d'estiu de l'Altai" +msgstr "Altai, hora d'estiu" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" msgstr "(UTC+07:00) Barnaül, Gorno-Altaisk" #: dlls/tzres/tzres.rc:108 -#, fuzzy -#| msgid "Central Europe Standard Time" msgctxt "maximum 31 characters" msgid "Central Europe Standard Time" -msgstr "Hora estàndard de l'Europa central" +msgstr "Europa, central, hora estàndard" #: dlls/tzres/tzres.rc:109 -#, fuzzy -#| msgid "Central Europe Daylight Time" msgctxt "maximum 31 characters" msgid "Central Europe Daylight Time" -msgstr "Hora d'estiu de l'Europa central" +msgstr "Europa, central, hora d'estiu" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" @@ -10559,12 +10535,12 @@ msgstr "(UTC+01:00) Belgrad, Bratislava, Budapest, Ljubljana, Praga" #: dlls/tzres/tzres.rc:192 msgctxt "maximum 31 characters" msgid "Iran Standard Time" -msgstr "Hora estàndard d'Iran" +msgstr "Iran, hora estàndard" #: dlls/tzres/tzres.rc:193 msgctxt "maximum 31 characters" msgid "Iran Daylight Time" -msgstr "Hora d'estiu d'Iran" +msgstr "Iran, hora d'estiu" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" @@ -10573,12 +10549,12 @@ msgstr "(UTC+03:30) Teheran" #: dlls/tzres/tzres.rc:318 msgctxt "maximum 31 characters" msgid "Saint Pierre Standard Time" -msgstr "Hora estàndard de Sant Pere" +msgstr "Sant Pere, hora estàndard" #: dlls/tzres/tzres.rc:319 msgctxt "maximum 31 characters" msgid "Saint Pierre Daylight Time" -msgstr "Hora d'estiu de Sant Pere" +msgstr "Sant Pere, hora d'estiu" #: dlls/tzres/tzres.rc:320 msgid "(UTC-03:00) Saint Pierre and Miquelon" @@ -10587,12 +10563,12 @@ msgstr "(UTC-03:00) Sant Pere i Miquelon" #: dlls/tzres/tzres.rc:327 msgctxt "maximum 31 characters" msgid "Sao Tome Standard Time" -msgstr "Hora estàndard de São Tomé" +msgstr "São Tomé, hora estàndard" #: dlls/tzres/tzres.rc:328 msgctxt "maximum 31 characters" msgid "Sao Tome Daylight Time" -msgstr "Hora d'estiu de São Tomé" +msgstr "São Tomé, hora d'estiu" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" @@ -10601,12 +10577,12 @@ msgstr "(UTC+00:00) São Tomé" #: dlls/tzres/tzres.rc:249 msgctxt "maximum 31 characters" msgid "Namibia Standard Time" -msgstr "Hora estàndard de Namíbia" +msgstr "Namíbia, hora estàndard" #: dlls/tzres/tzres.rc:250 msgctxt "maximum 31 characters" msgid "Namibia Daylight Time" -msgstr "Hora d'estiu de Namíbia" +msgstr "Namíbia, hora d'estiu" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" @@ -10615,30 +10591,26 @@ msgstr "(UTC+02:00) Windhoek" #: dlls/tzres/tzres.rc:369 msgctxt "maximum 31 characters" msgid "Tonga Standard Time" -msgstr "Hora estàndard de Tonga" +msgstr "Tonga, hora estàndard" #: dlls/tzres/tzres.rc:370 msgctxt "maximum 31 characters" msgid "Tonga Daylight Time" -msgstr "Hora d'estiu de Tonga" +msgstr "Tonga, hora d'estiu" #: dlls/tzres/tzres.rc:371 msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 -#, fuzzy -#| msgid "Mountain Standard Time (Mexico)" msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" -msgstr "Hora estàndard de les muntanyes (Mèxic)" +msgstr "Mèxic, muntanyenc, hora estànd." #: dlls/tzres/tzres.rc:241 -#, fuzzy -#| msgid "Mountain Daylight Time (Mexico)" msgctxt "maximum 31 characters" msgid "Mountain Daylight Time (Mexico)" -msgstr "Hora d'estiu de les muntanyes (Mèxic)" +msgstr "Mèxic, muntanyenc, hora d'estiu" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" @@ -10661,28 +10633,26 @@ msgstr "(UTC+00:00) Dublín, Edimburg, Lisboa, Londres" #: dlls/tzres/tzres.rc:342 msgctxt "maximum 31 characters" msgid "South Sudan Standard Time" -msgstr "Hora estàndard de Sudan del Sud" +msgstr "Sudan del sud, hora estàndard" #: dlls/tzres/tzres.rc:343 msgctxt "maximum 31 characters" msgid "South Sudan Daylight Time" -msgstr "Hora d'estiu de Sudan del Sud" +msgstr "Sudan del sud, hora d'estiu" #: dlls/tzres/tzres.rc:344 msgid "(UTC+02:00) Juba" msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 -#, fuzzy -#| msgid "Central Asia Standard Time" msgctxt "maximum 31 characters" msgid "Central Asia Standard Time" -msgstr "Hora estàndard de l'Àsia central" +msgstr "Àsia central, hora estàndard" #: dlls/tzres/tzres.rc:103 msgctxt "maximum 31 characters" msgid "Central Asia Daylight Time" -msgstr "Hora d'estiu de l'Àsia central" +msgstr "Àsia central, hora d'estiu" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" @@ -10691,12 +10661,12 @@ msgstr "(UTC+06:00) Astanà" #: dlls/tzres/tzres.rc:213 msgctxt "maximum 31 characters" msgid "Lord Howe Standard Time" -msgstr "Hora estàndard de Lord Howe" +msgstr "Lord Howe, hora estàndard" #: dlls/tzres/tzres.rc:214 msgctxt "maximum 31 characters" msgid "Lord Howe Daylight Time" -msgstr "Hora d'estiu de Lord Howe" +msgstr "Lord Howe, hora d'estiu" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" @@ -10705,12 +10675,12 @@ msgstr "(UTC+10:30) Illa de Lord Howe" #: dlls/tzres/tzres.rc:48 msgctxt "maximum 31 characters" msgid "Arabic Standard Time" -msgstr "Hora estàndard àrab" +msgstr "Aràbia, hora estàndard" #: dlls/tzres/tzres.rc:49 msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" -msgstr "Hora d'estiu àrab" +msgstr "Aràbia, hora d'estiu" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" @@ -10728,12 +10698,12 @@ msgstr "(UTC+13:00) Temps universal coordinat+13" #: dlls/tzres/tzres.rc:216 msgctxt "maximum 31 characters" msgid "Magadan Standard Time" -msgstr "Hora estàndard de Magadan" +msgstr "Magadan, hora estàndard" #: dlls/tzres/tzres.rc:217 msgctxt "maximum 31 characters" msgid "Magadan Daylight Time" -msgstr "Hora d'estiu de Magadan" +msgstr "Magadan, hora d'estiu" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" @@ -10742,12 +10712,12 @@ msgstr "(UTC+11:00) Magadan" #: dlls/tzres/tzres.rc:258 msgctxt "maximum 31 characters" msgid "Newfoundland Standard Time" -msgstr "Hora estàndard de Terranova" +msgstr "Terranova, hora estàndard" #: dlls/tzres/tzres.rc:259 msgctxt "maximum 31 characters" msgid "Newfoundland Daylight Time" -msgstr "Hora d'estiu de Terranova" +msgstr "Terranova, hora d'estiu" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" @@ -10756,30 +10726,26 @@ msgstr "(UTC-03:30) Terranova" #: dlls/tzres/tzres.rc:348 msgctxt "maximum 31 characters" msgid "Sudan Standard Time" -msgstr "Hora estàndard de Sudan" +msgstr "Sudan, hora estàndard" #: dlls/tzres/tzres.rc:349 msgctxt "maximum 31 characters" msgid "Sudan Daylight Time" -msgstr "Hora d'estiu de Sudan" +msgstr "Sudan, hora d'estiu" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Khartoum" msgstr "(UTC+02:00) Khartum" #: dlls/tzres/tzres.rc:438 -#, fuzzy -#| msgid "West Pacific Standard Time" msgctxt "maximum 31 characters" msgid "West Pacific Standard Time" -msgstr "Hora estàndard del Pacífic occidental" +msgstr "Pacífic de l'oest, hora estànd." #: dlls/tzres/tzres.rc:439 -#, fuzzy -#| msgid "West Pacific Daylight Time" msgctxt "maximum 31 characters" msgid "West Pacific Daylight Time" -msgstr "Hora d'estiu del Pacífic occidental" +msgstr "Pacífic, oest, hora d'estiu" #: dlls/tzres/tzres.rc:440 msgid "(UTC+10:00) Guam, Port Moresby" @@ -10788,26 +10754,26 @@ msgstr "(UTC+10:00) Guam, Port Moresby" #: dlls/tzres/tzres.rc:279 msgctxt "maximum 31 characters" msgid "Pacific Standard Time" -msgstr "Hora estàndard del Pacífic" +msgstr "Am. d. nord, Pacífic, h. estàn." #: dlls/tzres/tzres.rc:280 msgctxt "maximum 31 characters" msgid "Pacific Daylight Time" -msgstr "Hora d'estiu del Pacífic" +msgstr "Am. d. nord, Pacífic, h. estàn." #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "(UTC-08:00) Hora del Pacífic (EU i Canadà)" +msgstr "(UTC-08:00) Hora del Pacífic (EUA i Canadà)" #: dlls/tzres/tzres.rc:69 msgctxt "maximum 31 characters" msgid "Azerbaijan Standard Time" -msgstr "Hora estàndard de l'Azerbaidjan" +msgstr "Azerbaidjan, hora estàndard" #: dlls/tzres/tzres.rc:70 msgctxt "maximum 31 characters" msgid "Azerbaijan Daylight Time" -msgstr "Hora d'estiu de l'Azerbaidjan" +msgstr "Azerbaidjan, hora d'estiu" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" @@ -10816,12 +10782,12 @@ msgstr "(UTC+04:00) Bakú" #: dlls/tzres/tzres.rc:219 msgctxt "maximum 31 characters" msgid "Magallanes Standard Time" -msgstr "Hora estàndard de Magallanes" +msgstr "Magallanes, hora estàndard" #: dlls/tzres/tzres.rc:220 msgctxt "maximum 31 characters" msgid "Magallanes Daylight Time" -msgstr "Hora d'estiu de Magallanes" +msgstr "Magallanes, hora d'estiu" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" @@ -10830,12 +10796,12 @@ msgstr "(UTC-03:00) Punta Arenas" #: dlls/tzres/tzres.rc:324 msgctxt "maximum 31 characters" msgid "Samoa Standard Time" -msgstr "Hora estàndard de Samoa" +msgstr "Samoa, hora estàndard" #: dlls/tzres/tzres.rc:325 msgctxt "maximum 31 characters" msgid "Samoa Daylight Time" -msgstr "Hora d'estiu de Samoa" +msgstr "Samoa, hora d'estiu" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" @@ -10844,46 +10810,40 @@ msgstr "(UTC+13:00) Samoa" #: dlls/tzres/tzres.rc:201 msgctxt "maximum 31 characters" msgid "Kaliningrad Standard Time" -msgstr "Hora estàndard de Kaliningrad" +msgstr "Kaliningrad, hora estàndard" #: dlls/tzres/tzres.rc:202 msgctxt "maximum 31 characters" msgid "Kaliningrad Daylight Time" -msgstr "Hora d'estiu de Kaliningrad" +msgstr "Kaliningrad, hora d'estiu" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" msgstr "(UTC+02:00) Kaliningrad" #: dlls/tzres/tzres.rc:282 -#, fuzzy -#| msgid "Pacific Standard Time (Mexico)" msgctxt "maximum 31 characters" msgid "Pacific Standard Time (Mexico)" -msgstr "Hora estàndard del Pacífic (Mèxic)" +msgstr "Mèxic, Pacífic, hora estàndard" #: dlls/tzres/tzres.rc:283 -#, fuzzy -#| msgid "Pacific Daylight Time (Mexico)" msgctxt "maximum 31 characters" msgid "Pacific Daylight Time (Mexico)" -msgstr "Hora d'estiu del Pacífic (Mèxic)" +msgstr "Mèxic, Pacífic, hora d'estiu" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" msgstr "(UTC-08:00) Baixa Califòrnia" #: dlls/tzres/tzres.rc:228 -#, fuzzy -#| msgid "Middle East Standard Time" msgctxt "maximum 31 characters" msgid "Middle East Standard Time" -msgstr "Hora estàndard de l'Orient Mitjà" +msgstr "Orient Mitjà, hora estàndard" #: dlls/tzres/tzres.rc:229 msgctxt "maximum 31 characters" msgid "Middle East Daylight Time" -msgstr "Hora d'estiu de l'Orient Mitjà" +msgstr "Orient Mitjà, hora d'estiu" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" @@ -10892,30 +10852,26 @@ msgstr "(UTC+02:00) Beirut" #: dlls/tzres/tzres.rc:363 msgctxt "maximum 31 characters" msgid "Tokyo Standard Time" -msgstr "Hora estàndard de Tokyo" +msgstr "Tokyo, hora estàndard" #: dlls/tzres/tzres.rc:364 msgctxt "maximum 31 characters" msgid "Tokyo Daylight Time" -msgstr "Hora d'estiu de Tokyo" +msgstr "Tokyo, hora d'estiu" #: dlls/tzres/tzres.rc:365 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" msgstr "(UTC+09:00) Osaka, Sapporo, Tòquio" #: dlls/tzres/tzres.rc:210 -#, fuzzy -#| msgid "Line Islands Standard Time" msgctxt "maximum 31 characters" msgid "Line Islands Standard Time" -msgstr "Hora estàndard de les Illes de la Línia" +msgstr "Illes de la Línia, hora estànd." #: dlls/tzres/tzres.rc:211 -#, fuzzy -#| msgid "Line Islands Daylight Time" msgctxt "maximum 31 characters" msgid "Line Islands Daylight Time" -msgstr "Hora d'estiu de les Illes de la Línia" +msgstr "Illes de la Línia, hora d'estiu" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" @@ -10924,12 +10880,12 @@ msgstr "(UTC+14:00) Illa de Kiritimati" #: dlls/tzres/tzres.rc:129 msgctxt "maximum 31 characters" msgid "Cuba Standard Time" -msgstr "Hora estàndard de Cuba" +msgstr "Cuba, hora estàndard" #: dlls/tzres/tzres.rc:130 msgctxt "maximum 31 characters" msgid "Cuba Daylight Time" -msgstr "Hora d'estiu de Cuba" +msgstr "Cuba, hora d'estiu" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" @@ -10938,12 +10894,12 @@ msgstr "(UTC-05:00) L'Havana" #: dlls/tzres/tzres.rc:198 msgctxt "maximum 31 characters" msgid "Jordan Standard Time" -msgstr "Hora estàndard de Jordània" +msgstr "Jordània, hora estàndard" #: dlls/tzres/tzres.rc:199 msgctxt "maximum 31 characters" msgid "Jordan Daylight Time" -msgstr "Hora d'estiu de Jordània" +msgstr "Jordània, hora d'estiu" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" @@ -10952,21 +10908,21 @@ msgstr "(UTC+02:00) Amman" #: dlls/tzres/tzres.rc:117 msgctxt "maximum 31 characters" msgid "Central Standard Time" -msgstr "Hora estàndard central" +msgstr "Am. d. nord, central, h. estàn." #: dlls/tzres/tzres.rc:118 msgctxt "maximum 31 characters" msgid "Central Daylight Time" -msgstr "Hora d'estiu central" +msgstr "Am. d. nord, centr., h. d'estiu" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "(UTC-06:00) Hora central (EU i Canadà)" +msgstr "(UTC-06:00) Hora central (EUA i Canadà)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgctxt "maximum 31 characters" msgid "Russia Time Zone 3" -msgstr "Zona horària russa 3" +msgstr "Rússia, zona horària 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" @@ -10975,12 +10931,12 @@ msgstr "(UTC+04:00) Ijevsk, Samara" #: dlls/tzres/tzres.rc:417 msgctxt "maximum 31 characters" msgid "Volgograd Standard Time" -msgstr "Hora estàndard de Volgograd" +msgstr "Volgograd, hora estàndard" #: dlls/tzres/tzres.rc:418 msgctxt "maximum 31 characters" msgid "Volgograd Daylight Time" -msgstr "Hora d'estiu de Volgograd" +msgstr "Volgograd, hora d'estiu" #: dlls/tzres/tzres.rc:419 msgid "(UTC+04:00) Volgograd" @@ -10989,12 +10945,12 @@ msgstr "(UTC+04:00) Volgograd" #: dlls/tzres/tzres.rc:72 msgctxt "maximum 31 characters" msgid "Azores Standard Time" -msgstr "Hora estàndard de les Açores" +msgstr "Açores, hora estàndard" #: dlls/tzres/tzres.rc:73 msgctxt "maximum 31 characters" msgid "Azores Daylight Time" -msgstr "Hora d'estiu de les Açores" +msgstr "Açores, hora d'estiu" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" @@ -11003,12 +10959,12 @@ msgstr "(UTC-01:00) Açores" #: dlls/tzres/tzres.rc:264 msgctxt "maximum 31 characters" msgid "North Asia East Standard Time" -msgstr "Hora estàndard d'Àsia del nord" +msgstr "Àsia, nord-est, hora estàndard" #: dlls/tzres/tzres.rc:265 msgctxt "maximum 31 characters" msgid "North Asia East Daylight Time" -msgstr "Hora d'estiu d'Àsia del norest" +msgstr "Àsia, nord-est, hora d'estiu" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" @@ -11026,28 +10982,26 @@ msgstr "(UTC-11:00) Temps universal coordinat-11" #: dlls/tzres/tzres.rc:51 msgctxt "maximum 31 characters" msgid "Argentina Standard Time" -msgstr "Hora estàndard de l'Argentina" +msgstr "Argentina, hora estàndard" #: dlls/tzres/tzres.rc:52 msgctxt "maximum 31 characters" msgid "Argentina Daylight Time" -msgstr "Hora d'estiu de l'Argentina" +msgstr "Argentina, hora d'estiu" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) Ciutat de Buenos Aires" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turks And Caicos Standard Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" -msgstr "Hora estàndard de Turks i Caicos" +msgstr "Turks i Caicos, hora estàndard" #: dlls/tzres/tzres.rc:379 msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" -msgstr "Hora d'estiu de Turks i Caicos" +msgstr "Turks i Caicos, hora d'estiu" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" @@ -11056,12 +11010,12 @@ msgstr "(UTC-05:00) Turks i Caicos" #: dlls/tzres/tzres.rc:222 msgctxt "maximum 31 characters" msgid "Marquesas Standard Time" -msgstr "Hora estàndard de Marqueses" +msgstr "Marqueses, hora estàndard" #: dlls/tzres/tzres.rc:223 msgctxt "maximum 31 characters" msgid "Marquesas Daylight Time" -msgstr "Hora d'estiu de Marqueses" +msgstr "Marqueses, hora d'estiu" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" @@ -11070,12 +11024,12 @@ msgstr "(UTC-09:30) Illes Marqueses" #: dlls/tzres/tzres.rc:243 msgctxt "maximum 31 characters" msgid "Myanmar Standard Time" -msgstr "Hora estàndard de Birmània" +msgstr "Birmània, hora estàndard" #: dlls/tzres/tzres.rc:244 msgctxt "maximum 31 characters" msgid "Myanmar Daylight Time" -msgstr "Hora d'estiu de Birmània" +msgstr "Birmània, hora d'estiu" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" @@ -11093,12 +11047,12 @@ msgstr "(UTC) Temps universal coordinat" #: dlls/tzres/tzres.rc:189 msgctxt "maximum 31 characters" msgid "India Standard Time" -msgstr "Hora estàndard de l'Índia" +msgstr "Índia, hora estàndard" #: dlls/tzres/tzres.rc:190 msgctxt "maximum 31 characters" msgid "India Daylight Time" -msgstr "Hora d'estiu de l'Índia" +msgstr "Índia, hora d'estiu" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" @@ -11107,12 +11061,12 @@ msgstr "(UTC+05:30) Chennai, Kolkata, Mumbai, Nova Delhi" #: dlls/tzres/tzres.rc:180 msgctxt "maximum 31 characters" msgid "GTB Standard Time" -msgstr "Hora estàndard GTB" +msgstr "Europa, central, hora estàndard" #: dlls/tzres/tzres.rc:181 msgctxt "maximum 31 characters" msgid "GTB Daylight Time" -msgstr "Hora d'estiu GTB" +msgstr "Europa, central, hora d'estiu" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" @@ -11121,12 +11075,12 @@ msgstr "(UTC+02:00) Atenes, Bucarest" #: dlls/tzres/tzres.rc:375 msgctxt "maximum 31 characters" msgid "Turkey Standard Time" -msgstr "Hora estàndard de Turquia" +msgstr "Turquia, hora estàndard" #: dlls/tzres/tzres.rc:376 msgctxt "maximum 31 characters" msgid "Turkey Daylight Time" -msgstr "Hora d'estiu de Turquia" +msgstr "Turquia, hora d'estiu" #: dlls/tzres/tzres.rc:377 msgid "(UTC+03:00) Istanbul" @@ -11135,12 +11089,12 @@ msgstr "(UTC+03:00) Istanbul" #: dlls/tzres/tzres.rc:54 msgctxt "maximum 31 characters" msgid "Astrakhan Standard Time" -msgstr "Hora estàndard d'Àstrakhan" +msgstr "Àstrakhan, hora estàndard" #: dlls/tzres/tzres.rc:55 msgctxt "maximum 31 characters" msgid "Astrakhan Daylight Time" -msgstr "Hora d'estiu d'Àstrakhan" +msgstr "Àstrakhan, hora d'estiu" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" @@ -11149,28 +11103,26 @@ msgstr "(UTC+04:00) Àstrakhan, Uliànovsk" #: dlls/tzres/tzres.rc:162 msgctxt "maximum 31 characters" msgid "Fiji Standard Time" -msgstr "Hora estàndard de Fiji" +msgstr "Fiji, hora estàndard" #: dlls/tzres/tzres.rc:163 msgctxt "maximum 31 characters" msgid "Fiji Daylight Time" -msgstr "Hora d'estiu de Fiji" +msgstr "Fiji, hora d'estiu" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" msgstr "(UTC+12:00) Fiji" #: dlls/tzres/tzres.rc:87 -#, fuzzy -#| msgid "Canada Central Standard Time" msgctxt "maximum 31 characters" msgid "Canada Central Standard Time" -msgstr "Hora estàndard del Canadà central" +msgstr "Canadà, central, hora estàndard" #: dlls/tzres/tzres.rc:88 msgctxt "maximum 31 characters" msgid "Canada Central Daylight Time" -msgstr "Hora d'estiu del Canadà central" +msgstr "Canadà, central, hora d'estiu" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" @@ -11179,12 +11131,12 @@ msgstr "(UTC-06:00) Saskatchewan" #: dlls/tzres/tzres.rc:444 msgctxt "maximum 31 characters" msgid "Yukon Standard Time" -msgstr "Hora estàndard de Yukon" +msgstr "Yukon, hora estàndard" #: dlls/tzres/tzres.rc:445 msgctxt "maximum 31 characters" msgid "Yukon Daylight Time" -msgstr "Hora d'estiu de Yukon" +msgstr "Yukon, hora d'estiu" #: dlls/tzres/tzres.rc:446 msgid "(UTC-07:00) Yukon" @@ -11193,28 +11145,26 @@ msgstr "(UTC-07:00) Yukon" #: dlls/tzres/tzres.rc:354 msgctxt "maximum 31 characters" msgid "Taipei Standard Time" -msgstr "Hora estàndard de Taipei" +msgstr "Taipei, hora estàndard" #: dlls/tzres/tzres.rc:355 msgctxt "maximum 31 characters" msgid "Taipei Daylight Time" -msgstr "Hora d'estiu de Taipei" +msgstr "Taipei, hora d'estiu" #: dlls/tzres/tzres.rc:356 msgid "(UTC+08:00) Taipei" msgstr "(UTC+08:00) Taipei" #: dlls/tzres/tzres.rc:426 -#, fuzzy -#| msgid "W. Europe Standard Time" msgctxt "maximum 31 characters" msgid "W. Europe Standard Time" -msgstr "Hora estàndard d'Europa de l'oest" +msgstr "Europa, oest, hora estàndard" #: dlls/tzres/tzres.rc:427 msgctxt "maximum 31 characters" msgid "W. Europe Daylight Time" -msgstr "Hora d'estiu d'Europa de l'oest" +msgstr "Europa, oest, hora d'estiu" #: dlls/tzres/tzres.rc:428 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" @@ -11223,12 +11173,12 @@ msgstr "(UTC+01:00) Amsterdam, Berlín, Berna, Roma, Estocolm, Viena" #: dlls/tzres/tzres.rc:231 msgctxt "maximum 31 characters" msgid "Montevideo Standard Time" -msgstr "Hora estàndard de Montevideo" +msgstr "Montevideo, hora estàndard" #: dlls/tzres/tzres.rc:232 msgctxt "maximum 31 characters" msgid "Montevideo Daylight Time" -msgstr "Hora d'estiu de Montevideo" +msgstr "Montevideo, hora d'estiu" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" @@ -11237,12 +11187,12 @@ msgstr "(UTC-03:00) Montevideo" #: dlls/tzres/tzres.rc:285 msgctxt "maximum 31 characters" msgid "Pakistan Standard Time" -msgstr "Hora estàndard del Pakistan" +msgstr "Pakistan, hora estàndard" #: dlls/tzres/tzres.rc:286 msgctxt "maximum 31 characters" msgid "Pakistan Daylight Time" -msgstr "Hora d'estiu del Pakistan" +msgstr "Pakistan, hora d'estiu" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" @@ -11251,12 +11201,12 @@ msgstr "(UTC+05:00) Islamabad, Karachi" #: dlls/tzres/tzres.rc:366 msgctxt "maximum 31 characters" msgid "Tomsk Standard Time" -msgstr "Hora estàndard de Tomsk" +msgstr "Tomsk, hora estàndard" #: dlls/tzres/tzres.rc:367 msgctxt "maximum 31 characters" msgid "Tomsk Daylight Time" -msgstr "Hora d'estiu de Tomsk" +msgstr "Tomsk, hora d'estiu" #: dlls/tzres/tzres.rc:368 msgid "(UTC+07:00) Tomsk" @@ -11265,12 +11215,12 @@ msgstr "(UTC+07:00) Tomsk" #: dlls/tzres/tzres.rc:93 msgctxt "maximum 31 characters" msgid "Caucasus Standard Time" -msgstr "Hora estàndard del Caucas" +msgstr "Caucas, hora estàndard" #: dlls/tzres/tzres.rc:94 msgctxt "maximum 31 characters" msgid "Caucasus Daylight Time" -msgstr "Hora d'estiu del Caucas" +msgstr "Caucas, hora d'estiu" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" @@ -11279,30 +11229,26 @@ msgstr "(UTC+04:00) Erevan" #: dlls/tzres/tzres.rc:66 msgctxt "maximum 31 characters" msgid "AUS Eastern Standard Time" -msgstr "Hora estàndard oriental AUS" +msgstr "Austràlia, est, hora estàndard" #: dlls/tzres/tzres.rc:67 msgctxt "maximum 31 characters" msgid "AUS Eastern Daylight Time" -msgstr "Hora d'estiu de l'est AUS" +msgstr "Austràlia, est, hora d'estiu" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 -#, fuzzy -#| msgid "N. Central Asia Standard Time" msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" -msgstr "Hora estàndard d'Àsia del centre-nord" +msgstr "Àsia del mig-nord, hora estànd." #: dlls/tzres/tzres.rc:247 -#, fuzzy -#| msgid "N. Central Asia Daylight Time" msgctxt "maximum 31 characters" msgid "N. Central Asia Daylight Time" -msgstr "Hora d'estiu d'Àsia del centre-nord" +msgstr "Àsia del mig-nord, hora d'estiu" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" @@ -11311,12 +11257,12 @@ msgstr "(UTC+07:00) Novossibirsk" #: dlls/tzres/tzres.rc:150 msgctxt "maximum 31 characters" msgid "Eastern Standard Time" -msgstr "Hora estàndard de l'est" +msgstr "Am. del nord, est, hora estànd." #: dlls/tzres/tzres.rc:151 msgctxt "maximum 31 characters" msgid "Eastern Daylight Time" -msgstr "Hora d'estiu de l'est" +msgstr "Am. del nord, est, hora d'estiu" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" @@ -11325,28 +11271,26 @@ msgstr "(UTC-05:00) Hora de l'est (EU i Canadà)" #: dlls/tzres/tzres.rc:372 msgctxt "maximum 31 characters" msgid "Transbaikal Standard Time" -msgstr "Hora estàndard de Transbaikal" +msgstr "Transbaikal, hora estàndard" #: dlls/tzres/tzres.rc:373 msgctxt "maximum 31 characters" msgid "Transbaikal Daylight Time" -msgstr "Hora d'estiu de Transbaikal" +msgstr "Transbaikal, hora d'estiu" #: dlls/tzres/tzres.rc:374 msgid "(UTC+09:00) Chita" msgstr "(UTC+09:00) Txità" #: dlls/tzres/tzres.rc:141 -#, fuzzy -#| msgid "E. Europe Standard Time" msgctxt "maximum 31 characters" msgid "E. Europe Standard Time" -msgstr "Hora estàndard d'Europa de l'est" +msgstr "Europa, est, hora estàndard" #: dlls/tzres/tzres.rc:142 msgctxt "maximum 31 characters" msgid "E. Europe Daylight Time" -msgstr "Hora d'estiu d'Europa de l'est" +msgstr "Europa, est, hora d'estiu" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" @@ -11355,12 +11299,12 @@ msgstr "(UTC+02:00) Chisinau" #: dlls/tzres/tzres.rc:120 msgctxt "maximum 31 characters" msgid "Central Standard Time (Mexico)" -msgstr "Hora estàndard central (Mèxic)" +msgstr "Mèxic, central, hora estàndard" #: dlls/tzres/tzres.rc:121 msgctxt "maximum 31 characters" msgid "Central Daylight Time (Mexico)" -msgstr "Hora d'estiu central (Mèxic)" +msgstr "Mèxic, central, hora d'estiu" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" @@ -11369,12 +11313,12 @@ msgstr "(UTC-06:00) Guadalajara, Ciutat de Mèxic, Monterrey" #: dlls/tzres/tzres.rc:330 msgctxt "maximum 31 characters" msgid "Saratov Standard Time" -msgstr "Hora estàndard de Saràtov" +msgstr "Saràtov, hora estàndard" #: dlls/tzres/tzres.rc:331 msgctxt "maximum 31 characters" msgid "Saratov Daylight Time" -msgstr "Hora d'estiu de Saràtov" +msgstr "Saràtov, hora d'estiu" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" @@ -11383,12 +11327,12 @@ msgstr "(UTC+04:00) Saràtov" #: dlls/tzres/tzres.rc:57 msgctxt "maximum 31 characters" msgid "Atlantic Standard Time" -msgstr "Hora estàndard de l'Atlàntic" +msgstr "Atlàntic, hora estàndard" #: dlls/tzres/tzres.rc:58 msgctxt "maximum 31 characters" msgid "Atlantic Daylight Time" -msgstr "Hora d'estiu de l'Atlàntic" +msgstr "Atlàntic, hora d'estiu" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" @@ -11397,26 +11341,26 @@ msgstr "(UTC-04:00) Hora de l'Atlàntic (Canadà)" #: dlls/tzres/tzres.rc:237 msgctxt "maximum 31 characters" msgid "Mountain Standard Time" -msgstr "Hora estàndard de les muntanyes" +msgstr "Am. d. n., muntany., h. estàn." #: dlls/tzres/tzres.rc:238 msgctxt "maximum 31 characters" msgid "Mountain Daylight Time" -msgstr "Hora d'estiu de les muntanyes" +msgstr "Am. d. n., muntany., h. d'estiu" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "(UTC-07:00) Hora de les muntanyes (EU i Canadà)" +msgstr "(UTC-07:00) Hora de les muntanyes (EUA i Canadà)" #: dlls/tzres/tzres.rc:384 msgctxt "maximum 31 characters" msgid "US Eastern Standard Time" -msgstr "Hora estàndard de l'est EUA" +msgstr "Indiana, est, hora estànd." #: dlls/tzres/tzres.rc:385 msgctxt "maximum 31 characters" msgid "US Eastern Daylight Time" -msgstr "Hora d'estiu de l'est EUA" +msgstr "Indiana, est, hora d'estiu" #: dlls/tzres/tzres.rc:386 msgid "(UTC-05:00) Indiana (East)" @@ -11425,28 +11369,26 @@ msgstr "(UTC-05:00) Indiana (est)" #: dlls/tzres/tzres.rc:321 msgctxt "maximum 31 characters" msgid "Sakhalin Standard Time" -msgstr "Hora estàndard de Sakhalín" +msgstr "Sakhalín, hora estàndard" #: dlls/tzres/tzres.rc:322 msgctxt "maximum 31 characters" msgid "Sakhalin Daylight Time" -msgstr "Hora d'estiu de Sakhalín" +msgstr "Sakhalín, hora d'estiu" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" msgstr "(UTC+11:00) Sakhalín" #: dlls/tzres/tzres.rc:270 -#, fuzzy -#| msgid "North Korea Standard Time" msgctxt "maximum 31 characters" msgid "North Korea Standard Time" -msgstr "Hora estàndard de Corea del Nord" +msgstr "Corea del Nord, hora estàndard" #: dlls/tzres/tzres.rc:271 msgctxt "maximum 31 characters" msgid "North Korea Daylight Time" -msgstr "Hora d'estiu de Corea del Nord" +msgstr "Corea del Nord, hora d'estiu" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" @@ -11455,30 +11397,26 @@ msgstr "(UTC+09:00) Pyongyang" #: dlls/tzres/tzres.rc:357 msgctxt "maximum 31 characters" msgid "Tasmania Standard Time" -msgstr "Hora estàndard de Tasmània" +msgstr "Tasmània, hora estàndard" #: dlls/tzres/tzres.rc:358 msgctxt "maximum 31 characters" msgid "Tasmania Daylight Time" -msgstr "Hora d'estiu de Tasmània" +msgstr "Tasmània, hora d'estiu" #: dlls/tzres/tzres.rc:359 msgid "(UTC+10:00) Hobart" msgstr "(UTC+10:00) Hobart" #: dlls/tzres/tzres.rc:99 -#, fuzzy -#| msgid "Central America Standard Time" msgctxt "maximum 31 characters" msgid "Central America Standard Time" -msgstr "Hora estàndard de l'Àmerica central" +msgstr "Àmerica central, hora estàndard" #: dlls/tzres/tzres.rc:100 -#, fuzzy -#| msgid "Central America Daylight Time" msgctxt "maximum 31 characters" msgid "Central America Daylight Time" -msgstr "Hora d'estiu de l'Àmerica central" +msgstr "Àmerica central, hora d'estiu" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" @@ -11494,54 +11432,42 @@ msgid "(UTC-02:00) Coordinated Universal Time-02" msgstr "(UTC-02:00) Temps universal coordinat-02" #: dlls/tzres/tzres.rc:387 -#, fuzzy -#| msgid "US Mountain Standard Time" msgctxt "maximum 31 characters" msgid "US Mountain Standard Time" -msgstr "Hora estàndard de les muntanyes EUA" +msgstr "Arizona, muntanyenc, h. estànd." #: dlls/tzres/tzres.rc:388 -#, fuzzy -#| msgid "US Mountain Daylight Time" msgctxt "maximum 31 characters" msgid "US Mountain Daylight Time" -msgstr "Hora d'estiu de les muntanyes EUA" +msgstr "Arizona, muntanyenc, h. d'estiu" #: dlls/tzres/tzres.rc:389 msgid "(UTC-07:00) Arizona" msgstr "(UTC-07:00) Arizona" #: dlls/tzres/tzres.rc:339 -#, fuzzy -#| msgid "South Africa Standard Time" msgctxt "maximum 31 characters" msgid "South Africa Standard Time" -msgstr "Hora estàndard de l'Àfrica del Sud" +msgstr "Àfrica del Sud, hora estàndard" #: dlls/tzres/tzres.rc:340 -#, fuzzy -#| msgid "South Africa Daylight Time" msgctxt "maximum 31 characters" msgid "South Africa Daylight Time" -msgstr "Hora d'estiu de l'Àfrica del Sud" +msgstr "Àfrica del Sud, hora d'estiu" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) Harare, Pretòria" #: dlls/tzres/tzres.rc:96 -#, fuzzy -#| msgid "Cen. Australia Standard Time" msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" -msgstr "Hora estàndard de l'Austràlia central" +msgstr "Austràlia, central, hora estàn." #: dlls/tzres/tzres.rc:97 -#, fuzzy -#| msgid "Cen. Australia Daylight Time" msgctxt "maximum 31 characters" msgid "Cen. Australia Daylight Time" -msgstr "Hora d'estiu de l'Austràlia central" +msgstr "Austràlia central, hora d'estiu" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" @@ -11559,12 +11485,12 @@ msgstr "(UTC-09:00) Temps universal coordinat-09" #: dlls/tzres/tzres.rc:345 msgctxt "maximum 31 characters" msgid "Sri Lanka Standard Time" -msgstr "Hora estàndard de Sri Lanka" +msgstr "Sri Lanka, hora estàndard" #: dlls/tzres/tzres.rc:346 msgctxt "maximum 31 characters" msgid "Sri Lanka Daylight Time" -msgstr "Hora d'estiu de Sri Lanka" +msgstr "Sri Lanka, hora d'estiu" #: dlls/tzres/tzres.rc:347 msgid "(UTC+05:30) Sri Jayawardenepura" @@ -11573,12 +11499,12 @@ msgstr "(UTC+05:30) Sri Jayewardenepura" #: dlls/tzres/tzres.rc:30 msgctxt "maximum 31 characters" msgid "Afghanistan Standard Time" -msgstr "Hora estàndard de l'Afganistan" +msgstr "Afganistan, hora estàndard" #: dlls/tzres/tzres.rc:31 msgctxt "maximum 31 characters" msgid "Afghanistan Daylight Time" -msgstr "Hora d'estiu de l'Afganistan" +msgstr "Afganistan, hora d'estiu" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" @@ -11587,30 +11513,26 @@ msgstr "(UTC+04:30) Kabul" #: dlls/tzres/tzres.rc:441 msgctxt "maximum 31 characters" msgid "Yakutsk Standard Time" -msgstr "Hora estàndard de Iakutsk" +msgstr "Iakutsk, hora estàndard" #: dlls/tzres/tzres.rc:442 msgctxt "maximum 31 characters" msgid "Yakutsk Daylight Time" -msgstr "Hora d'estiu de Iakutsk" +msgstr "Iakutsk, hora d'estiu" #: dlls/tzres/tzres.rc:443 msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) Iakutsk" #: dlls/tzres/tzres.rc:309 -#, fuzzy -#| msgid "SA Eastern Standard Time" msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" -msgstr "Hora estàndard d'Àmerica del sud-est" +msgstr "Am. del sud, est, hora estànd." #: dlls/tzres/tzres.rc:310 -#, fuzzy -#| msgid "SA Eastern Daylight Time" msgctxt "maximum 31 characters" msgid "SA Eastern Daylight Time" -msgstr "Hora d'estiu d'Àmerica del sud-est" +msgstr "Am. del sud, est, hora d'estiu" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" @@ -11619,12 +11541,12 @@ msgstr "(UTC-03:00) Caiena, Fortaleza" #: dlls/tzres/tzres.rc:42 msgctxt "maximum 31 characters" msgid "Arab Standard Time" -msgstr "Hora estàndard àrab" +msgstr "Aràbia, hora estàndard" #: dlls/tzres/tzres.rc:43 msgctxt "maximum 31 characters" msgid "Arab Daylight Time" -msgstr "Hora d'estiu àrab" +msgstr "Aràbia, hora d'estiu" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" @@ -11633,12 +11555,12 @@ msgstr "(UTC+03:00) Kuwait, Riad" #: dlls/tzres/tzres.rc:45 msgctxt "maximum 31 characters" msgid "Arabian Standard Time" -msgstr "Hora estàndard de l'Àrabia" +msgstr "Àrabia, hora estàndard" #: dlls/tzres/tzres.rc:46 msgctxt "maximum 31 characters" msgid "Arabian Daylight Time" -msgstr "Hora d'estiu de l'Àrabia" +msgstr "Àrabia, hora d'estiu" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" @@ -11647,12 +11569,12 @@ msgstr "(UTC+04:00) Abu Dhabi, Masqat" #: dlls/tzres/tzres.rc:360 msgctxt "maximum 31 characters" msgid "Tocantins Standard Time" -msgstr "Hora estàndard de Tocantins" +msgstr "Tocantins, hora estàndard" #: dlls/tzres/tzres.rc:361 msgctxt "maximum 31 characters" msgid "Tocantins Daylight Time" -msgstr "Hora d'estiu de Tocantins" +msgstr "Tocantins, hora d'estiu" #: dlls/tzres/tzres.rc:362 msgid "(UTC-03:00) Araguaina" @@ -11661,30 +11583,26 @@ msgstr "(UTC-03:00) Araguaína" #: dlls/tzres/tzres.rc:306 msgctxt "maximum 31 characters" msgid "Russian Standard Time" -msgstr "Hora estàndard de Rússia" +msgstr "Rússia, hora estàndard" #: dlls/tzres/tzres.rc:307 msgctxt "maximum 31 characters" msgid "Russian Daylight Time" -msgstr "Hora d'estiu de Rússia" +msgstr "Rússia, hora d'estiu" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Moscou, Sant Petersburg" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Aus Central W. Standard Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" -msgstr "Hora estàndard d'Austràlia del centre-oest" +msgstr "Austràlia, mig-oest, h. estànd." #: dlls/tzres/tzres.rc:64 -#, fuzzy -#| msgid "Aus Central W. Daylight Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Daylight Time" -msgstr "Hora d'estiu d'Austràlia del centre-oest" +msgstr "Austràlia, mig-oest, h. d'estiu" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" @@ -11693,12 +11611,12 @@ msgstr "(UTC+08:45) Eucla" #: dlls/tzres/tzres.rc:294 msgctxt "maximum 31 characters" msgid "Romance Standard Time" -msgstr "Hora estàndard romànic" +msgstr "Europa, central, hora estàndard" #: dlls/tzres/tzres.rc:295 msgctxt "maximum 31 characters" msgid "Romance Daylight Time" -msgstr "Hora d'estiu romànic" +msgstr "Europa, central, hora d'estiu" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" @@ -11707,12 +11625,12 @@ msgstr "(UTC+01:00) Brussel·les, Copenhaguen, Madrid, París" #: dlls/tzres/tzres.rc:159 msgctxt "maximum 31 characters" msgid "Ekaterinburg Standard Time" -msgstr "Hora estàndard de Iekaterinburg" +msgstr "Iekaterinburg, hora estàndard" #: dlls/tzres/tzres.rc:160 msgctxt "maximum 31 characters" msgid "Ekaterinburg Daylight Time" -msgstr "Hora d'estiu de Iekaterinburg" +msgstr "Iekaterinburg, hora d'estiu" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" @@ -11721,7 +11639,7 @@ msgstr "(UTC+05:00) Iekaterinburg" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgctxt "maximum 31 characters" msgid "Russia Time Zone 11" -msgstr "Zona horària russa 11" +msgstr "Rússia, zona horària 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" @@ -11730,12 +11648,12 @@ msgstr "(UTC+12:00) Anàdir, Petropàvlovsk-Kamtxatski" #: dlls/tzres/tzres.rc:435 msgctxt "maximum 31 characters" msgid "West Bank Standard Time" -msgstr "Hora estàndard de Cisjordània" +msgstr "Cisjordània, hora estàndard" #: dlls/tzres/tzres.rc:436 msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" -msgstr "Hora d'estiu de Cisjordània" +msgstr "Cisjordània, hora d'estiu" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" @@ -11744,12 +11662,12 @@ msgstr "(UTC+02:00) Gaza, Hebron" #: dlls/tzres/tzres.rc:351 msgctxt "maximum 31 characters" msgid "Syria Standard Time" -msgstr "Hora estàndard de Síria" +msgstr "Síria, hora estàndard" #: dlls/tzres/tzres.rc:352 msgctxt "maximum 31 characters" msgid "Syria Daylight Time" -msgstr "Hora d'estiu de Síria" +msgstr "Síria, hora d'estiu" #: dlls/tzres/tzres.rc:353 msgid "(UTC+02:00) Damascus" @@ -11758,12 +11676,12 @@ msgstr "(UTC+02:00) Damasc" #: dlls/tzres/tzres.rc:60 msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" -msgstr "Hora estàndard central AUS" +msgstr "Austràlia, central, hora estàn." #: dlls/tzres/tzres.rc:61 msgctxt "maximum 31 characters" msgid "AUS Central Daylight Time" -msgstr "Hora d'estiu central AUS" +msgstr "Austràlia, centre, hora d'estiu" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" @@ -11786,12 +11704,12 @@ msgstr "(UTC+00:00) Monròvia, Reykjavík" #: dlls/tzres/tzres.rc:381 msgctxt "maximum 31 characters" msgid "Ulaanbaatar Standard Time" -msgstr "Hora estàndard d'Ulan Bator" +msgstr "Ulan Bator, hora estàndard" #: dlls/tzres/tzres.rc:382 msgctxt "maximum 31 characters" msgid "Ulaanbaatar Daylight Time" -msgstr "Hora d'estiu d'Ulan Bator" +msgstr "Ulan Bator, hora d'estiu" #: dlls/tzres/tzres.rc:383 msgid "(UTC+08:00) Ulaanbaatar" @@ -11800,12 +11718,12 @@ msgstr "(UTC+08:00) Ulaanbaatar" #: dlls/tzres/tzres.rc:261 msgctxt "maximum 31 characters" msgid "Norfolk Standard Time" -msgstr "Hora estàndard de Norfolk" +msgstr "Norfolk, hora estàndard" #: dlls/tzres/tzres.rc:262 msgctxt "maximum 31 characters" msgid "Norfolk Daylight Time" -msgstr "Hora d'estiu de Norfolk" +msgstr "Norfolk, hora d'estiu" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" @@ -11814,12 +11732,12 @@ msgstr "(UTC+11:00) Illa Norfolk" #: dlls/tzres/tzres.rc:195 msgctxt "maximum 31 characters" msgid "Israel Standard Time" -msgstr "Hora estàndard d'Israel" +msgstr "Israel, hora estàndard" #: dlls/tzres/tzres.rc:196 msgctxt "maximum 31 characters" msgid "Israel Daylight Time" -msgstr "Hora d'estiu d'Israel" +msgstr "Israel, hora d'estiu" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" @@ -11828,30 +11746,26 @@ msgstr "(UTC+02:00) Jerusalem" #: dlls/tzres/tzres.rc:78 msgctxt "maximum 31 characters" msgid "Bangladesh Standard Time" -msgstr "Hora estàndard de Bangla Desh" +msgstr "Bangla Desh, hora estàndard" #: dlls/tzres/tzres.rc:79 msgctxt "maximum 31 characters" msgid "Bangladesh Daylight Time" -msgstr "Hora d'estiu de Bangla Desh" +msgstr "Bangla Desh, hora d'estiu" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 -#, fuzzy -#| msgid "SA Pacific Standard Time" msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" -msgstr "Hora estàndard del Pacífic de l'Amèrica del Sud" +msgstr "Am. del sud, Pacífic, h. estàn." #: dlls/tzres/tzres.rc:313 -#, fuzzy -#| msgid "SA Pacific Daylight Time" msgctxt "maximum 31 characters" msgid "SA Pacific Daylight Time" -msgstr "Hora d'estiu del Pacífic de l'Amèrica del Sud" +msgstr "Am. d. sud, Pacífic, h. d'estiu" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" @@ -11860,12 +11774,12 @@ msgstr "(UTC-05:00) Bogotà, Lima, Quito, Rio Branco" #: dlls/tzres/tzres.rc:432 msgctxt "maximum 31 characters" msgid "West Asia Standard Time" -msgstr "Hora estàndard d'Àsia de l'oest" +msgstr "Àsia de l'oest, hora estàndard" #: dlls/tzres/tzres.rc:433 msgctxt "maximum 31 characters" msgid "West Asia Daylight Time" -msgstr "Hora d'estiu d'Àsia de l'oest" +msgstr "Àsia de l'oest, hora d'estiu" #: dlls/tzres/tzres.rc:434 msgid "(UTC+05:00) Ashgabat, Tashkent" @@ -11874,12 +11788,12 @@ msgstr "(UTC+05:00) Aixkhabad, Taixkent" #: dlls/tzres/tzres.rc:33 msgctxt "maximum 31 characters" msgid "Alaskan Standard Time" -msgstr "Hora estàndard d'Alaska" +msgstr "Alaska, hora estàndard" #: dlls/tzres/tzres.rc:34 msgctxt "maximum 31 characters" msgid "Alaskan Daylight Time" -msgstr "Hora d'estiu d'Alaska" +msgstr "Alaska, hora d'estiu" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" @@ -11888,30 +11802,26 @@ msgstr "(UTC-09:00) Alaska" #: dlls/tzres/tzres.rc:288 msgctxt "maximum 31 characters" msgid "Paraguay Standard Time" -msgstr "Hora estàndard del Paraguai" +msgstr "Paraguai, hora estàndard" #: dlls/tzres/tzres.rc:289 msgctxt "maximum 31 characters" msgid "Paraguay Daylight Time" -msgstr "Hora d'estiu del Paraguai" +msgstr "Paraguai, hora d'estiu" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" msgstr "(UTC-04:00) Asunción" #: dlls/tzres/tzres.rc:132 -#, fuzzy -#| msgid "Dateline Standard Time" msgctxt "maximum 31 characters" msgid "Dateline Standard Time" -msgstr "Hora estàndard de la línia de canvi de data" +msgstr "Línia de data, hora estàndard" #: dlls/tzres/tzres.rc:133 -#, fuzzy -#| msgid "Dateline Daylight Time" msgctxt "maximum 31 characters" msgid "Dateline Daylight Time" -msgstr "Hora d'estiu de la línia de canvi de data" +msgstr "Línia de data, hora d'estiu" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" @@ -11920,12 +11830,12 @@ msgstr "(UTC-12:00) Línia internacional de canvi de data occidental" #: dlls/tzres/tzres.rc:207 msgctxt "maximum 31 characters" msgid "Libya Standard Time" -msgstr "Hora estàndard de Líbia" +msgstr "Líbia, hora estàndard" #: dlls/tzres/tzres.rc:208 msgctxt "maximum 31 characters" msgid "Libya Daylight Time" -msgstr "Hora d'estiu de Líbia" +msgstr "Líbia, hora d'estiu" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" @@ -11934,12 +11844,12 @@ msgstr "(UTC+02:00) Trípoli" #: dlls/tzres/tzres.rc:75 msgctxt "maximum 31 characters" msgid "Bahia Standard Time" -msgstr "Hora estàndard de Bahia" +msgstr "Bahia, hora estàndard" #: dlls/tzres/tzres.rc:76 msgctxt "maximum 31 characters" msgid "Bahia Daylight Time" -msgstr "Hora d'estiu de Bahia" +msgstr "Bahia, hora d'estiu" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" @@ -11948,12 +11858,12 @@ msgstr "(UTC-03:00) Salvador" #: dlls/tzres/tzres.rc:411 msgctxt "maximum 31 characters" msgid "Venezuela Standard Time" -msgstr "Hora estàndard de Veneçuela" +msgstr "Veneçuela, hora estàndard" #: dlls/tzres/tzres.rc:412 msgctxt "maximum 31 characters" msgid "Venezuela Daylight Time" -msgstr "Hora d'estiu de Veneçuela" +msgstr "Veneçuela, hora d'estiu" #: dlls/tzres/tzres.rc:413 msgid "(UTC-04:00) Caracas" @@ -11962,12 +11872,12 @@ msgstr "(UTC-04:00) Caracas" #: dlls/tzres/tzres.rc:84 msgctxt "maximum 31 characters" msgid "Bougainville Standard Time" -msgstr "Hora estàndard de Bougainville" +msgstr "Bougainville, hora estàndard" #: dlls/tzres/tzres.rc:85 msgctxt "maximum 31 characters" msgid "Bougainville Daylight Time" -msgstr "Hora d'estiu de Bougainville" +msgstr "Bougainville, hora d'estiu" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" @@ -11976,30 +11886,26 @@ msgstr "(UTC+11:00) Illa de Bougainville" #: dlls/tzres/tzres.rc:186 msgctxt "maximum 31 characters" msgid "Hawaiian Standard Time" -msgstr "Hora estàndard de Hawaii" +msgstr "Hawaii, hora estàndard" #: dlls/tzres/tzres.rc:187 msgctxt "maximum 31 characters" msgid "Hawaiian Daylight Time" -msgstr "Hora d'estiu de Hawaii" +msgstr "Hawaii, hora d'estiu" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" msgstr "(UTC-10:00) Hawaii" #: dlls/tzres/tzres.rc:333 -#, fuzzy -#| msgid "SE Asia Standard Time" msgctxt "maximum 31 characters" msgid "SE Asia Standard Time" -msgstr "Hora estàndard de l'Àsia del Sud-est" +msgstr "Àsia del sud-est, hora estànd." #: dlls/tzres/tzres.rc:334 -#, fuzzy -#| msgid "SE Asia Daylight Time" msgctxt "maximum 31 characters" msgid "SE Asia Daylight Time" -msgstr "Hora d'estiu de l'Àsia del Sud-est" +msgstr "Àsia del sud-est, hora d'estiu" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" @@ -12008,30 +11914,26 @@ msgstr "(UTC+07:00) Bangkok, Hanoi, Jakarta" #: dlls/tzres/tzres.rc:291 msgctxt "maximum 31 characters" msgid "Qyzylorda Standard Time" -msgstr "Hora estàndard de Khizilordà" +msgstr "Khizilordà, hora estàndard" #: dlls/tzres/tzres.rc:292 msgctxt "maximum 31 characters" msgid "Qyzylorda Daylight Time" -msgstr "Hora d'estiu de Khizilordà" +msgstr "Khizilordà, hora d'estiu" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" msgstr "(UTC+05:00) Khizilordà" #: dlls/tzres/tzres.rc:429 -#, fuzzy -#| msgid "W. Mongolia Standard Time" msgctxt "maximum 31 characters" msgid "W. Mongolia Standard Time" -msgstr "Hora estàndard de Mongòlia de l'oest" +msgstr "Mongòlia, oest, hora estàndard" #: dlls/tzres/tzres.rc:430 -#, fuzzy -#| msgid "W. Mongolia Daylight Time" msgctxt "maximum 31 characters" msgid "W. Mongolia Daylight Time" -msgstr "Hora d'estiu de Mongòlia de l'oest" +msgstr "Mongòlia, oest, hora d'estiu" #: dlls/tzres/tzres.rc:431 msgid "(UTC+07:00) Hovd" @@ -12040,12 +11942,12 @@ msgstr "(UTC+07:00) Hovd" #: dlls/tzres/tzres.rc:255 msgctxt "maximum 31 characters" msgid "New Zealand Standard Time" -msgstr "Hora estàndard de Nova Zelanda" +msgstr "Nova Zelanda, hora estàndard" #: dlls/tzres/tzres.rc:256 msgctxt "maximum 31 characters" msgid "New Zealand Daylight Time" -msgstr "Hora d'estiu de Nova Zelanda" +msgstr "Nova Zelanda, hora d'estiu" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" @@ -12054,12 +11956,12 @@ msgstr "(UTC+12:00) Auckland, Wellington" #: dlls/tzres/tzres.rc:36 msgctxt "maximum 31 characters" msgid "Aleutian Standard Time" -msgstr "Hora estàndard aleutiana" +msgstr "Aleutia, hora estàndard" #: dlls/tzres/tzres.rc:37 msgctxt "maximum 31 characters" msgid "Aleutian Daylight Time" -msgstr "Hora d'estiu aleutiana" +msgstr "Aleutia, hora d'estiu" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" @@ -12068,28 +11970,26 @@ msgstr "(UTC-10:00) Illes Aleutianes" #: dlls/tzres/tzres.rc:273 msgctxt "maximum 31 characters" msgid "Omsk Standard Time" -msgstr "Hora estàndard d'Omsk" +msgstr "Omsk, hora estàndard" #: dlls/tzres/tzres.rc:274 msgctxt "maximum 31 characters" msgid "Omsk Daylight Time" -msgstr "Hora d'estiu d'Omsk" +msgstr "Omsk, hora d'estiu" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 -#, fuzzy -#| msgid "Central Brazilian Standard Time" msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" -msgstr "Hora estàndard del Brasil central" +msgstr "Brasil, central, hora estàndard" #: dlls/tzres/tzres.rc:106 msgctxt "maximum 31 characters" msgid "Central Brazilian Daylight Time" -msgstr "Hora d'estiu del Brasil central" +msgstr "Brasil, central, hora d'estiu" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" @@ -12098,30 +11998,26 @@ msgstr "(UTC-04:00) Cuiabá" #: dlls/tzres/tzres.rc:81 msgctxt "maximum 31 characters" msgid "Belarus Standard Time" -msgstr "Hora estàndard de Bielorússia" +msgstr "Bielorússia, hora estàndard" #: dlls/tzres/tzres.rc:82 msgctxt "maximum 31 characters" msgid "Belarus Daylight Time" -msgstr "Hora d'estiu de Bielorússia" +msgstr "Bielorússia, hora d'estiu" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 -#, fuzzy -#| msgid "SA Western Standard Time" msgctxt "maximum 31 characters" msgid "SA Western Standard Time" -msgstr "Hora estàndard d'Àmerica del sud-oest" +msgstr "Am. del sud, oest, hora estànd." #: dlls/tzres/tzres.rc:316 -#, fuzzy -#| msgid "SA Western Daylight Time" msgctxt "maximum 31 characters" msgid "SA Western Daylight Time" -msgstr "Hora d'estiu d'Àmerica del sud-oest" +msgstr "Am. del sud, oest, hora d'estiu" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" @@ -12130,30 +12026,26 @@ msgstr "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" #: dlls/tzres/tzres.rc:174 msgctxt "maximum 31 characters" msgid "Greenland Standard Time" -msgstr "Hora estàndard de Groenlàndia" +msgstr "Groenlàndia, hora estàndard" #: dlls/tzres/tzres.rc:175 msgctxt "maximum 31 characters" msgid "Greenland Daylight Time" -msgstr "Hora d'estiu de Groenlàndia" +msgstr "Groenlàndia, hora d'estiu" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" msgstr "(UTC-03:00) Groenlàndia" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Easter Island Standard Time" msgctxt "maximum 31 characters" msgid "Easter Island Standard Time" -msgstr "Hora estàndard de l'Illa de Pasqua" +msgstr "Illa de Pasqua, hora estàndard" #: dlls/tzres/tzres.rc:148 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgctxt "maximum 31 characters" msgid "Easter Island Daylight Time" -msgstr "Hora d'estiu de l'Illa de Pasqua" +msgstr "Illa de Pasqua, hora d'estiu" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" @@ -12162,7 +12054,7 @@ msgstr "(UTC-06:00) Illa de Pasqua" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgctxt "maximum 31 characters" msgid "Russia Time Zone 10" -msgstr "Zona horària russa 10" +msgstr "Rússia, zona horària 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" @@ -12171,12 +12063,12 @@ msgstr "(UTC+11:00) Txokurdakh" #: dlls/tzres/tzres.rc:156 msgctxt "maximum 31 characters" msgid "Egypt Standard Time" -msgstr "Hora estàndard d'Egipte" +msgstr "Egipte, hora estàndard" #: dlls/tzres/tzres.rc:157 msgctxt "maximum 31 characters" msgid "Egypt Daylight Time" -msgstr "Hora d'estiu d'Egipte" +msgstr "Egipte, hora d'estiu" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" @@ -12185,12 +12077,12 @@ msgstr "(UTC+02:00) El Caire" #: dlls/tzres/tzres.rc:153 msgctxt "maximum 31 characters" msgid "Eastern Standard Time (Mexico)" -msgstr "Hora estàndard de l'est (Mèxic)" +msgstr "Mèxic, est, hora estàndard" #: dlls/tzres/tzres.rc:154 msgctxt "maximum 31 characters" msgid "Eastern Daylight Time (Mexico)" -msgstr "Hora d'estiu de l'est (Mèxic)" +msgstr "Mèxic, est, hora d'estiu" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" @@ -12199,12 +12091,12 @@ msgstr "(UTC-05:00) Chetumal" #: dlls/tzres/tzres.rc:225 msgctxt "maximum 31 characters" msgid "Mauritius Standard Time" -msgstr "Hora estàndard de Maurici" +msgstr "Maurici, hora estàndard" #: dlls/tzres/tzres.rc:226 msgctxt "maximum 31 characters" msgid "Mauritius Daylight Time" -msgstr "Hora d'estiu de Maurici" +msgstr "Maurici, hora d'estiu" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" @@ -12213,12 +12105,12 @@ msgstr "(UTC+04:00) Port Louis" #: dlls/tzres/tzres.rc:414 msgctxt "maximum 31 characters" msgid "Vladivostok Standard Time" -msgstr "Hora estàndard de Vladivostok" +msgstr "Vladivostok, hora estàndard" #: dlls/tzres/tzres.rc:415 msgctxt "maximum 31 characters" msgid "Vladivostok Daylight Time" -msgstr "Hora d'estiu de Vladivostok" +msgstr "Vladivostok, hora d'estiu" #: dlls/tzres/tzres.rc:416 msgid "(UTC+10:00) Vladivostok" @@ -12227,12 +12119,12 @@ msgstr "(UTC+10:00) Vladivostok" #: dlls/tzres/tzres.rc:336 msgctxt "maximum 31 characters" msgid "Singapore Standard Time" -msgstr "Hora estàndard de Singapur" +msgstr "Singapur, hora estàndard" #: dlls/tzres/tzres.rc:337 msgctxt "maximum 31 characters" msgid "Singapore Daylight Time" -msgstr "Hora d'estiu de Singapur" +msgstr "Singapur, hora d'estiu" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" @@ -12241,46 +12133,40 @@ msgstr "(UTC+08:00) Kuala Lumpur, Singapur" #: dlls/tzres/tzres.rc:204 msgctxt "maximum 31 characters" msgid "Korea Standard Time" -msgstr "Hora estàndard de Corea" +msgstr "Corea del Sud, hora estàndard" #: dlls/tzres/tzres.rc:205 msgctxt "maximum 31 characters" msgid "Korea Daylight Time" -msgstr "Hora d'estiu de Corea" +msgstr "Corea del Sud, hora d'estiu" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" msgstr "(UTC+09:00) Seül" #: dlls/tzres/tzres.rc:123 -#, fuzzy -#| msgid "Chatham Islands Standard Time" msgctxt "maximum 31 characters" msgid "Chatham Islands Standard Time" -msgstr "Hora estàndard de les Illes de Chatham" +msgstr "Illes de Chatham, hora estànd." #: dlls/tzres/tzres.rc:124 -#, fuzzy -#| msgid "Chatham Islands Daylight Time" msgctxt "maximum 31 characters" msgid "Chatham Islands Daylight Time" -msgstr "Hora d'estiu de les Illes de Chatham" +msgstr "Illes de Chatham, hora d'estiu" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" msgstr "(UTC+12:45) Illes Chatham" #: dlls/tzres/tzres.rc:135 -#, fuzzy -#| msgid "E. Africa Standard Time" msgctxt "maximum 31 characters" msgid "E. Africa Standard Time" -msgstr "Hora estàndard d'Àfrica de l'est" +msgstr "Àfrica, est, hora estàndard" #: dlls/tzres/tzres.rc:136 msgctxt "maximum 31 characters" msgid "E. Africa Daylight Time" -msgstr "Hora d'estiu d'Àfrica de l'est" +msgstr "Àfrica, est, hora d'estiu" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" @@ -12289,120 +12175,96 @@ msgstr "(UTC+03:00) Nairobi" #: dlls/tzres/tzres.rc:165 msgctxt "maximum 31 characters" msgid "FLE Standard Time" -msgstr "Hora estàndard FLE" +msgstr "Europa, central, hora estàndard" #: dlls/tzres/tzres.rc:166 msgctxt "maximum 31 characters" msgid "FLE Daylight Time" -msgstr "Hora d'estiu FLE" +msgstr "Europa, central, hora d'estiu" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) Hèlsinki, Kíev, Riga, Sofia, Tallinn, Vílnius" #: dlls/tzres/tzres.rc:144 -#, fuzzy -#| msgid "E. South America Standard Time" msgctxt "maximum 31 characters" msgid "E. South America Standard Time" -msgstr "Hora estàndard d'Àmerica del sudest" +msgstr "Am. del sud, est, hora estànd." #: dlls/tzres/tzres.rc:145 -#, fuzzy -#| msgid "E. South America Daylight Time" msgctxt "maximum 31 characters" msgid "E. South America Daylight Time" -msgstr "Hora d'estiu d'Àmerica del sudest" +msgstr "Am. del sud, est, hora d'estiu" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" msgstr "(UTC-03:00) Brasília" #: dlls/tzres/tzres.rc:114 -#, fuzzy -#| msgid "Central Pacific Standard Time" msgctxt "maximum 31 characters" msgid "Central Pacific Standard Time" -msgstr "Hora estàndard del Pacífic central" +msgstr "Pacífic central, hora estàndard" #: dlls/tzres/tzres.rc:115 -#, fuzzy -#| msgid "Central Pacific Daylight Time" msgctxt "maximum 31 characters" msgid "Central Pacific Daylight Time" -msgstr "Hora d'estiu del Pacífic central" +msgstr "Pacífic central, hora d'estiu" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) Illes de Salomó, Nova Caledònia" #: dlls/tzres/tzres.rc:423 -#, fuzzy -#| msgid "W. Central Africa Standard Time" msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" -msgstr "Hora estàndard d'Àfrica del centre-oest" +msgstr "Àfrica central, oest, h. estàn." #: dlls/tzres/tzres.rc:424 -#, fuzzy -#| msgid "W. Central Africa Daylight Time" msgctxt "maximum 31 characters" msgid "W. Central Africa Daylight Time" -msgstr "Hora d'estiu d'Àfrica del centre-oest" +msgstr "Àfrica centr., oest, h. d'estiu" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) West Central Africa" msgstr "(UTC+01:00) Àfrica del centre-oest" #: dlls/tzres/tzres.rc:276 -#, fuzzy -#| msgid "Pacific SA Standard Time" msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" -msgstr "Hora estàndard del Pacífic de l'Amèrica del Sud" +msgstr "Am. del sud, Pacífic, h. estàn." #: dlls/tzres/tzres.rc:277 -#, fuzzy -#| msgid "Pacific SA Daylight Time" msgctxt "maximum 31 characters" msgid "Pacific SA Daylight Time" -msgstr "Hora d'estiu del Pacífic de l'Amèrica del Sud" +msgstr "Am. d. sud, Pacífic, h. d'estiu" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" msgstr "(UTC-04:00) Santiago" #: dlls/tzres/tzres.rc:138 -#, fuzzy -#| msgid "E. Australia Standard Time" msgctxt "maximum 31 characters" msgid "E. Australia Standard Time" -msgstr "Hora estàndard d'Austràlia de l'est" +msgstr "Austràlia, est, hora estàndard" #: dlls/tzres/tzres.rc:139 -#, fuzzy -#| msgid "E. Australia Daylight Time" msgctxt "maximum 31 characters" msgid "E. Australia Daylight Time" -msgstr "Hora d'estiu d'Austràlia de l'est" +msgstr "Austràlia, est, hora d'estiu" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" msgstr "(UTC+10:00) Brisbane" #: dlls/tzres/tzres.rc:420 -#, fuzzy -#| msgid "W. Australia Standard Time" msgctxt "maximum 31 characters" msgid "W. Australia Standard Time" -msgstr "Hora estàndard d'Austràlia de l'oest" +msgstr "Austràlia, oest, hora estàndard" #: dlls/tzres/tzres.rc:421 -#, fuzzy -#| msgid "W. Australia Daylight Time" msgctxt "maximum 31 characters" msgid "W. Australia Daylight Time" -msgstr "Hora d'estiu d'Austràlia de l'oest" +msgstr "Austràlia, oest, hora d'estiu" #: dlls/tzres/tzres.rc:422 msgid "(UTC+08:00) Perth" @@ -18935,8 +18797,8 @@ msgid "" msgstr "" "Si aquest problema no està present en el Windows i encara no s'ha reportat, " "podeu desar la informació detallada a un fitxer utilitzant el botó " -"\"Anomenar i Desar\", i llavors <a href=\"https://wiki.winehq.org/" -"Bugs\">presentar un informe d'error</a> i ajuntar aquest fitxer a l'informe." +"\"Anomenar i Desar\", i llavors <a href=\"https://wiki.winehq.org/Bugs" +"\">presentar un informe d'error</a> i ajuntar aquest fitxer a l'informe." #: programs/winedbg/winedbg.rc:40 msgid "" -- 2.35.1

1 0

[PATCH 3/3] propsys: Implement InitVariantFromFileTime.
by Daniel Lehman March 16, 2022

March 16, 2022

1 0

[PATCH 2/3] propsys/tests: Add some InitVariantFromFileTime tests.
by Daniel Lehman March 16, 2022

March 16, 2022

1 0

[PATCH 1/3] propsys: Add InitVariantFromFileTime stub.
by Daniel Lehman March 16, 2022

March 16, 2022

1 0

[PATCH 2/2] ntdll: Treat INVALID_HANDLE_VALUE as success in CloseHandle.
by Daniel Lehman March 16, 2022

March 16, 2022

2 2

[PATCH v2 1/6] winedbg: memory_get_string(_indirect) should take a const src address.
by Brendan Shanks March 16, 2022

March 16, 2022

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/winedbg/debugger.h | 6 ++++-- programs/winedbg/memory.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 0cc2f8b7a6c..d275182c4f9 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -402,8 +402,10 @@ extern void memory_examine(const struct dbg_lvalue *lvalue, int coun extern void* memory_to_linear_addr(const ADDRESS64* address); extern BOOL memory_get_current_pc(ADDRESS64* address); extern BOOL memory_get_current_stack(ADDRESS64* address); -extern BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, BOOL unicode, char* buffer, int size); -extern BOOL memory_get_string_indirect(struct dbg_process* pcs, void* addr, BOOL unicode, WCHAR* buffer, int size); +extern BOOL memory_get_string(struct dbg_process* pcs, const void* addr, BOOL in_debuggee, BOOL unicode, + char* buffer, int size); +extern BOOL memory_get_string_indirect(struct dbg_process* pcs, const void* addr, BOOL unicode, + WCHAR* buffer, int size); extern BOOL memory_get_register(DWORD regno, DWORD_PTR** value, char* buffer, int len); extern void memory_disassemble(const struct dbg_lvalue*, const struct dbg_lvalue*, int instruction_count); extern BOOL memory_disasm_one_insn(ADDRESS64* addr); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index faa5ac9ddcb..7fe3d342b33 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -371,7 +371,7 @@ BOOL memory_store_float(const struct dbg_lvalue* lvalue, double *ret) return memory_write_value(lvalue, size, ret); } -BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, +BOOL memory_get_string(struct dbg_process* pcs, const void* addr, BOOL in_debuggee, BOOL unicode, char* buffer, int size) { SIZE_T sz; @@ -402,7 +402,7 @@ BOOL memory_get_string(struct dbg_process* pcs, void* addr, BOOL in_debuggee, return TRUE; } -BOOL memory_get_string_indirect(struct dbg_process* pcs, void* addr, BOOL unicode, WCHAR* buffer, int size) +BOOL memory_get_string_indirect(struct dbg_process* pcs, const void* addr, BOOL unicode, WCHAR* buffer, int size) { void* ad = 0; SIZE_T sz; -- 2.34.1

1 5

[PATCH v3 1/2] user32/tests: Test that ShowWindow(SW_SHOWMINIMIZED) shouldn't make a window visible.
by Zhiyi Zhang March 16, 2022

March 16, 2022

This bug can be triggered on Mutter because it unminimizes windows when handling map requests. Also see https://gitlab.gnome.org/GNOME/mutter/-/blob/main/src/x11/events.c#L1525 for how map requests are handled. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v3: Supersede 227676~227677. Fix test failures. dlls/user32/tests/win.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cfcec5cc78f..f47fcd2fe65 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7420,7 +7420,9 @@ static void test_ShowWindow(void) RECT rcMain, rc, rcMinimized, rcClient, rcEmpty, rcMaximized, rcResized, rcNonClient, rcBroken; LPARAM ret; MONITORINFO mon_info; - unsigned int i; + unsigned int i, timeout = 0; + COLORREF color; + HDC hdc; DWORD test_style[] = { @@ -7693,6 +7695,30 @@ static void test_ShowWindow(void) flush_events(TRUE); + /* Test SW_SHOWMINIMIZED shouldn't restore windows from minimized state */ + SetWindowPos(hwndMain, 0, 100, 100, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + hwnd = CreateWindowA("static", "test", WS_POPUP, 100, 100, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + ShowWindow(hwnd, SW_SHOWMINIMIZED); + flush_events(TRUE); + + hdc = GetDC(0); + color = GetPixel(hdc, 150, 150); + /* Desktop pixels may take a while to update */ + while (color != 0xffffff && timeout < 1000) + { + Sleep(100); + timeout += 100; + color = GetPixel(hdc, 150, 150); + } + /* The window rectangle of hwndMain is (100, 100, 300, 300). If the window manager unminimizes + * hwnd, hwnd will end up obscuring hwndMain. Mutter is such a window manager that unminimizes + * windows when handling map requests and thus can demonstrate this bug */ + todo_wine_if(color != 0xffffff) + ok(color == 0xffffff, "Expected color %#x, got %#x.\n", 0xffffff, color); + ReleaseDC(0, hdc); + DestroyWindow(hwnd); + /* test maximize and restore windows without setting WS_CAPTION */ for (i = 0; i < ARRAY_SIZE(test_style); ++i) -- 2.32.0

3 2