wine-devel December 2021

wine-devel@winehq.org

85 participants
585 discussions

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

30 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msi/package.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7488c095080..596affbaae4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -553,6 +553,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) GetWindowsDirectoryW(windir, MAX_PATH); len = lstrlenW(windir) + lstrlenW(L"Microsoft.NET\\Framework\\") + lstrlenW(L"v2.0.50727") + … [View More]

1 0

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

30 Dec '21

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

1 0

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

30 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52273 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wm_reader.c | 8 +++++--- dlls/wmvcore/tests/wmvcore.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 3a1f1684fdc..693e9adfc19 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1503,9 +1503,11 @@ static HRESULT init_stream(… [View More]

1 0

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

30 Dec '21

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

1 0

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

30 Dec '21

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

1 0

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

30 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: adjust the message too (thanks Gijs for catching this.) dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 95f858a86e3..8d4af019f16 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3235,7 +3235,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &writefds, &exceptfds, … [View More]

2 1

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

30 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 46f26d32e50..ec428acaf32 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5222,6 +5222,37 @@ static void test_accept_events(struct event_test_ctx *ctx) closesocket(client); closesocket(listener); + + /* The socket returned … [View More]

2 2

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

29 Dec '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a678f619342..95f858a86e3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3325,6 +3325,16 @@ static void test_select(void) ok(ret == 1, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + … [View More]

2 7

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

29 Dec '21

2 1

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

29 Dec '21

This should fix crashes on W10L vms, when we pass NULL to InternetUnlockRequestFile after prior lock already failed. Crashes are here: https://test.winehq.org/data/tests/wininet:http.html Behavior after crash is here: https://testbot.winehq.org/JobDetails.pl?Key=104580 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wininet/tests/http.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/… [View More]

3 2

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

29 Dec '21

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

3 11

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

29 Dec '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- MAINTAINERS | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1f92c3a50b..97f9c78ae21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -53,7 +53,7 @@ P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> F: dlls/comdlg32/itemdlg.c F: … [View More]

1 0

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

29 Dec '21

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

1 0

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

29 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52288 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/unixlib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index e89ebe35248..56a0bed308d 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -752,6 +752,7 @@ static NTSTATUS unix_getaddrinfo( void *args ) dst->ai_addrlen = sockaddr_from_unix( (const union … [View More]

1 0

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

29 Dec '21

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

1 0

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

29 Dec '21

Without this patch conhost would attempt to process non-existent input, spewing stdout with various cursor moves and incorrectly returning the ReadConsole call early. Fix that by only attempting input processing if there are actually input records to be processed and properly returning STATUS_PENDING if the input processing is not yet complete. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> --- programs/conhost/conhost.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 … [View More]

2 2

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

29 Dec '21

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

2 1

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

29 Dec '21

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

1 0

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

29 Dec '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ole32/compositemoniker.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index a94e4734f45..05901bb52b3 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -751,7 +751,11 @@ static HRESULT WINAPI CompositeMonikerImpl_CommonPrefixWith(IMoniker *iface, IMo heap_free(components); heap_free(… [View More]

1 1

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

28 Dec '21

Prior to c94f44f9b4559351c0ca86d344fe37aabc15200c (widl: Search for imported typelibs in the library search path.), widl looked for tlb files in the path specified by BIN_TO_INCLUDEDIR. After that commit, widl looks for tlb files in a subdirectory (get_pe_dir) of BIN_TO_DLLDIR (which mingw-w64 sets to the same as BIN_TO_INCLUDEDIR). For compatibility with the mingw-w64 usecase, check for tlb files in the directory specified by BIN_TO_DLLDIR without a separate subdirectory suffix too. Signed-… [View More]

1 0

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

28 Dec '21

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

1 1

[PATCH website] [website] Modify Wine man pages hyperlinks
by Floris Renaud 28 Dec '21

28 Dec '21

Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=50516 Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=49884 Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- templates/en/documentation.template | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/en/documentation.template b/templates/en/documentation.template index d0d1b6f9..ce28b225 100644 --- a/templates/en/documentation.template +++ b/templates/en/documentation.template @@ -26,33 +… [View More]26,33 @@ </li> </ul> - <h2>Man Pages</h2> + <h2><a href="https://wiki.winehq.org/Man_Pages">Man Pages</a></h2> <ul> - <li><a href="{$root}/docs/wine">wine man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/wine">wine man page</a> <br>Command line options for the wine binary.</li><br> - <li><a href="{$root}/docs/wineserver">wineserver man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/wineserver">wineserver man page</a> <br>Command line options for the wineserver binary.</li><br> - <li><a href="{$root}/docs/winebuild">winebuild man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/winebuild">winebuild man page</a> <br>Command line options for the winebuild binary.</li><br> - <li><a href="{$root}/docs/winedump">winedump man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/winedump">winedump man page</a> <br>Command line options for the winedump binary.</li><br> - <li><a href="{$root}/docs/winemaker">winemaker man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/winemaker">winemaker man page</a> <br>Command line options for the winemaker script.</li><br> - <li><a href="{$root}/docs/widl">widl man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/widl">widl man page</a> <br>Command line options for the IDL compiler.</li><br> - <li><a href="{$root}/docs/wmc">wmc man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/wmc">wmc man page</a> <br>Command line options for the message compiler.</li><br> - <li><a href="{$root}/docs/wrc">wrc man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/wrc">wrc man page</a> <br>Command line options for the resource compiler.</li><br> - <li><a href="{$root}/docs/winegcc">winegcc man page</a> + <li><a href="https://wiki.winehq.org/Man_Pages/winegcc">winegcc man page</a> <br>Command line options for the winegcc compiler.</li><br> </ul> -- 2.34.1 [View Less]

2 1

[PATCH] winex11.drv: Map the window in UpdateLayeredWindow.
by Gabriel Ivăncescu 28 Dec '21

28 Dec '21

Fixes a regression introduced by 8892b79118fde5f2307ecbbdb03a8d0c489c8b3d, because set_window_pos is called before UpdateLayeredWindow, which calls the driver's WindowPosChanged earlier. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51984 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winex11.drv/window.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 29473ce..843d10a … [View More]

1 1

[PATCH v2] wined3d: Also check the internal format when determining GL raw blit compatibility.
by Conor McCarthy 28 Dec '21

28 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51935 Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- Supersedes 222249. --- dlls/wined3d/texture.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 851c3c36b..a638ec4ee 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6163,6 +6163,26 @@ static void raw_blitter_clear(struct wined3d_blitter *blitter, … [View More]struct wined3d_de clear_rects, draw_rect, flags, colour, depth, stencil); } +static bool gl_formats_compatible(struct wined3d_texture *src_texture, DWORD src_location, + struct wined3d_texture *dst_texture, DWORD dst_location) +{ + GLuint src_internal, dst_internal; + bool src_ds, dst_ds; + + src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; + dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; + if (src_ds == dst_ds) + return true; + /* Also check the internal format because, e.g. WINED3DFMT_D24_UNORM_S8_UINT has nonzero depth and stencil + * sizes as does WINED3DFMT_R24G8_TYPELESS when bound with flag WINED3D_BIND_DEPTH_STENCIL, but these share + * the same internal format with WINED3DFMT_R24_UNORM_X8_TYPELESS. */ + src_internal = wined3d_gl_get_internal_format(&src_texture->resource, + wined3d_format_gl(src_texture->resource.format), src_location == WINED3D_LOCATION_TEXTURE_SRGB); + dst_internal = wined3d_gl_get_internal_format(&dst_texture->resource, + wined3d_format_gl(dst_texture->resource.format), dst_location == WINED3D_LOCATION_TEXTURE_SRGB); + return src_internal == dst_internal; +} + static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, @@ -6177,19 +6197,15 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit unsigned int src_level, src_layer, dst_level, dst_layer; struct wined3d_blitter *next; GLuint src_name, dst_name; - bool src_ds, dst_ds; DWORD location; - src_ds = src_texture->resource.format->depth_size || src_texture->resource.format->stencil_size; - dst_ds = dst_texture->resource.format->depth_size || dst_texture->resource.format->stencil_size; - /* If we would need to copy from a renderbuffer or drawable, we'd probably * be better off using the FBO blitter directly, since we'd need to use it * to copy the resource contents to the texture anyway. * * We also can't copy between depth/stencil and colour resources, since * the formats are considered incompatible in OpenGL. */ - if (op != WINED3D_BLIT_OP_RAW_BLIT || (src_ds != dst_ds) + if (op != WINED3D_BLIT_OP_RAW_BLIT || !gl_formats_compatible(src_texture, src_location, dst_texture, dst_location) || (src_texture->resource.format->id == dst_texture->resource.format->id && (!(src_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) || !(dst_location & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB))))) -- 2.33.0 [View Less]

2 1

[PATCH] d3d10core/tests: Don't test stencil_ref again if it wasn't touched
by Michael Stefaniuc 28 Dec '21

28 Dec '21

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a1c4be46b7f..d7fc9efa901 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5717,7 +5717,6 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(stencil_ref == 3, "Got unexpected stencil ref %u.\n", stencil_ref); tmp_ds_state = … [View More]

3 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel December 2021