June 2010 - Wine-commits - list.winehq.org

Andrew Eikum : shell32: UNIX paths should be parsed by unixfs.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: a77fb7f5508c268fbc82c30da1774d97586ccb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77fb7f5508c268fbc82c30da… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 28 12:06:27 2010 -0500 shell32: UNIX paths should be parsed by unixfs. Some tests show that trying to create a PIDL from a path starting with '/' fails in Windows, so this change shouldn't cause a conflict with the shell namespace. --- dlls/shell32/shfldr_desktop.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 46a725f..e3798a6 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -213,21 +213,36 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, if (*lpszDisplayName) { - WCHAR szPath[MAX_PATH]; - LPWSTR pathPtr; - - /* build a complete path to create a simple pidl */ - lstrcpynW(szPath, This->sPathTarget, MAX_PATH); - pathPtr = PathAddBackslashW(szPath); - if (pathPtr) + if (*lpszDisplayName == '/') { - lstrcpynW(pathPtr, lpszDisplayName, MAX_PATH - (pathPtr - szPath)); - hr = _ILCreateFromPathW(szPath, &pidlTemp); + /* UNIX paths should be parsed by unixfs */ + IShellFolder *unixFS; + hr = UnixFolder_Constructor(NULL, &IID_IShellFolder, (LPVOID*)&unixFS); + if (SUCCEEDED(hr)) + { + hr = IShellFolder_ParseDisplayName(unixFS, NULL, NULL, + lpszDisplayName, NULL, &pidlTemp, NULL); + IShellFolder_Release(unixFS); + } } else { - /* should never reach here, but for completeness */ - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + /* build a complete path to create a simple pidl */ + WCHAR szPath[MAX_PATH]; + LPWSTR pathPtr; + + lstrcpynW(szPath, This->sPathTarget, MAX_PATH); + pathPtr = PathAddBackslashW(szPath); + if (pathPtr) + { + lstrcpynW(pathPtr, lpszDisplayName, MAX_PATH - (pathPtr - szPath)); + hr = _ILCreateFromPathW(szPath, &pidlTemp); + } + else + { + /* should never reach here, but for completeness */ + hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } } } else

1 0

Andrew Eikum : include: Add new SHCNRF flags.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 5f884d19c69b8a857083c013e5aecf6031d7bf70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f884d19c69b8a857083c013e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 28 10:06:51 2010 -0500 include: Add new SHCNRF flags. --- include/shlobj.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index dbf8518..5f125c1 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1297,11 +1297,17 @@ typedef struct _SHChangeNotifyEntry #define SHCNF_PRINTERW 0x0006 #define SHCNF_TYPE 0x00FF #define SHCNF_FLUSH 0x1000 -#define SHCNF_FLUSHNOWAIT 0x2000 +#define SHCNF_FLUSHNOWAIT 0x3000 +#define SHCNF_NOTIFYRECURSIVE 0x10000 #define SHCNF_PATH WINELIB_NAME_AW(SHCNF_PATH) #define SHCNF_PRINTER WINELIB_NAME_AW(SHCNF_PRINTER) +#define SHCNRF_InterruptLevel 0x0001 +#define SHCNRF_ShellLevel 0x0002 +#define SHCNRF_RecursiveInterrupt 0x1000 +#define SHCNRF_NewDelivery 0x8000 + void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2); typedef enum {

1 0

Alexandre Julliard : winex11: Disable antialiasing if either fontconfig or Xft disable it explicitly.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 4d9a31177113f53407595f055ea3dbdc6df6bcf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9a31177113f53407595f055… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 29 14:58:31 2010 +0200 winex11: Disable antialiasing if either fontconfig or Xft disable it explicitly. --- dlls/winex11.drv/xrender.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 2fc804a..4f900b2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -905,6 +905,7 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) break; } + font_smoothing = TRUE; /* default to enabled */ #ifdef SONAME_LIBFONTCONFIG if (fontconfig_installed) { @@ -956,9 +957,10 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) case FC_RGBA_BGR: entry->aa_default = AA_BGR; break; case FC_RGBA_VRGB: entry->aa_default = AA_VRGB; break; case FC_RGBA_VBGR: entry->aa_default = AA_VBGR; break; - case FC_RGBA_NONE: entry->aa_default = antialias ? AA_Grey : AA_None; break; + case FC_RGBA_NONE: entry->aa_default = AA_Grey; break; } } + if (!antialias) font_smoothing = FALSE; pFcPatternDestroy( match ); } pFcPatternDestroy( pattern ); @@ -984,11 +986,14 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) else if (!strcmp( value, "bgr" )) entry->aa_default = AA_BGR; else if (!strcmp( value, "vrgb" )) entry->aa_default = AA_VRGB; else if (!strcmp( value, "vbgr" )) entry->aa_default = AA_VBGR; - else if (!strcmp( value, "none" )) entry->aa_default = antialias ? AA_Grey : AA_None; + else if (!strcmp( value, "none" )) entry->aa_default = AA_Grey; } wine_tsx11_unlock(); + if (!antialias) font_smoothing = FALSE; } + if (!font_smoothing) entry->aa_default = AA_None; + /* we can't support subpixel without xrender */ if (!X11DRV_XRender_Installed && entry->aa_default > AA_Grey) entry->aa_default = AA_Grey; }

1 0

Andrew Eikum : shell32: Pass the file extension to ParseDisplayName in unixfs's SetNameOf.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 2b3fea0249de423a3056a3ba3215fa86cb057e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3fea0249de423a3056a3ba3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 28 09:35:36 2010 -0500 shell32: Pass the file extension to ParseDisplayName in unixfs's SetNameOf. --- dlls/shell32/shfldr_unixfs.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index dfd7255..9c9f94a 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1183,9 +1183,9 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H static const WCHAR awcInvalidChars[] = { '\\', '/', ':', '*', '?', '"', '<', '>', '|' }; char szSrc[FILENAME_MAX], szDest[FILENAME_MAX]; - WCHAR wszSrcRelative[MAX_PATH]; + WCHAR wszSrcRelative[MAX_PATH], *pwszExt = NULL; unsigned int i; - int cBasePathLen = lstrlenA(This->m_pszPath); + int cBasePathLen = lstrlenA(This->m_pszPath), cNameLen; struct stat statDest; LPITEMIDLIST pidlSrc, pidlDest, pidlRelativeDest; LPOLESTR lpwszName; @@ -1221,8 +1221,8 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H _ILSimpleGetTextW(pidl, wszSrcRelative, MAX_PATH) && SHELL_FS_HideExtension(wszSrcRelative)) { - WCHAR *pwszExt = PathFindExtensionW(wszSrcRelative); int cLenDest = strlen(szDest); + pwszExt = PathFindExtensionW(wszSrcRelative); WideCharToMultiByte(CP_UNIXCP, 0, pwszExt, -1, szDest + cLenDest, FILENAME_MAX - cLenDest, NULL, NULL); } @@ -1238,8 +1238,14 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H return E_FAIL; /* Build a pidl for the path of the renamed file */ - lpwszName = SHAlloc((lstrlenW(lpcwszName)+1)*sizeof(WCHAR)); /* due to const correctness. */ + cNameLen = lstrlenW(lpcwszName) + 1; + if(pwszExt) + cNameLen += lstrlenW(pwszExt); + lpwszName = SHAlloc(cNameLen*sizeof(WCHAR)); /* due to const correctness. */ lstrcpyW(lpwszName, lpcwszName); + if(pwszExt) + lstrcatW(lpwszName, pwszExt); + hr = IShellFolder2_ParseDisplayName(iface, NULL, NULL, lpwszName, NULL, &pidlRelativeDest, NULL); SHFree(lpwszName); if (FAILED(hr)) {

1 0

Ricardo Filipe : mshtml: Fix Portuguese Portugal translation.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: c009107754dbaccb2d449b65b6f4330183a830c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c009107754dbaccb2d449b65b… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Tue Jun 29 01:52:15 2010 -0700 mshtml: Fix Portuguese Portugal translation. --- dlls/mshtml/Pt.rc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index 689f930..be98a59 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -66,9 +66,10 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Instalador Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "O Wine não conseguiu encontrar o pacote Gecko que é necessário para aplicações com HTML embutido" \ + "funcionarem corretamente. O Wine pode automaticamente efetuar o download e instalá-lo por si.\n\n" \ + "Nota: é recomendável usar os pacotes da sua distribuição em vez disso. \n\ +Veja http://wiki.winehq.org/Gecko para mais detalhes.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP

1 0

Piotr Caban : wininet: Reconnect if persistent connection was closed by server.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: ee68473fe5c244cc3ad3ed6ad8751652b9962c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee68473fe5c244cc3ad3ed6ad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 29 12:20:51 2010 +0200 wininet: Reconnect if persistent connection was closed by server. --- dlls/wininet/http.c | 23 ++++++++++++++++++++--- dlls/wininet/netconnection.c | 6 +++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 200d03f..4b4bc5b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3454,6 +3454,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, do { DWORD len; + BOOL reusing_connection; char *ascii_req; loop_next = FALSE; @@ -3504,6 +3505,11 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, TRACE("Request header -> %s\n", debugstr_w(requestString) ); /* Send the request and store the results */ + if(NETCON_connected(&lpwhr->netConnection)) + reusing_connection = TRUE; + else + reusing_connection = FALSE; + if ((res = HTTP_OpenConnection(lpwhr)) != ERROR_SUCCESS) goto lend; @@ -3545,6 +3551,13 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, goto lend; responseLen = HTTP_GetResponseHeaders(lpwhr, TRUE); + /* FIXME: We should know that connection is closed before sending + * headers. Otherwise wrong callbacks are executed */ + if(!responseLen && reusing_connection) { + TRACE("Connection closed by server, reconnecting\n"); + loop_next = TRUE; + continue; + } INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen, @@ -4457,9 +4470,6 @@ static INT HTTP_GetResponseHeaders(http_request_t *lpwhr, BOOL clear) TRACE("-->\n"); - /* clear old response headers (eg. from a redirect response) */ - if (clear) HTTP_clear_response_headers( lpwhr ); - if (!NETCON_connected(&lpwhr->netConnection)) goto lend; @@ -4471,6 +4481,13 @@ static INT HTTP_GetResponseHeaders(http_request_t *lpwhr, BOOL clear) buflen = MAX_REPLY_LEN; if (!read_line(lpwhr, bufferA, &buflen)) goto lend; + + /* clear old response headers (eg. from a redirect response) */ + if (clear) { + HTTP_clear_response_headers( lpwhr ); + clear = FALSE; + } + rc += buflen; MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); /* check is this a status code line? */ diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 5aa647a..abd7415 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -770,6 +770,8 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int if (!connection->useSSL) { *recvd = recv(connection->socketFD, buf, len, flags); + if(!*recvd) + NETCON_close(connection); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; } else @@ -779,8 +781,10 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int /* Check if EOF was received */ if(!*recvd && (pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_ZERO_RETURN - || pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_SYSCALL)) + || pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_SYSCALL)) { + NETCON_close(connection); return ERROR_SUCCESS; + } return *recvd > 0 ? ERROR_SUCCESS : ERROR_INTERNET_CONNECTION_ABORTED; #else

1 0

Kovács András : wldap32: Add Hungarian translation.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 53828fa0e765285eae93429ae410da9f37ca9d71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53828fa0e765285eae93429ae… Author: Kovács András <andras(a)csevego.net> Date: Mon Jun 28 23:38:33 2010 +0200 wldap32: Add Hungarian translation. --- dlls/wldap32/Makefile.in | 1 + dlls/wldap32/wldap32_Hu.rc | 128 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index 625dd4b..47dee4f 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -35,6 +35,7 @@ RC_SRCS = \ wldap32_En.rc \ wldap32_Es.rc \ wldap32_Fr.rc \ + wldap32_Hu.rc \ wldap32_It.rc \ wldap32_Ko.rc \ wldap32_Lt.rc \ diff --git a/dlls/wldap32/wldap32_Hu.rc b/dlls/wldap32/wldap32_Hu.rc new file mode 100644 index 0000000..9357208 --- /dev/null +++ b/dlls/wldap32/wldap32_Hu.rc @@ -0,0 +1,128 @@ +/* + * Hungarian resources for WLDAP32 + * + * Copyright 2010 Andras Kovacs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 0 "Sikeres" + 1 "Műveleti hiba" + 2 "Protokoll hiba" + 3 "Időkorlát túllépés" + 4 "Méretkorlát túllépés" + 5 "Hasonlítás hamis" + 6 "Hasonlítás igaz" + 7 "Hitelesítési mód nem támogatott" + 8 "erős hitelesítés szükséges" + 9 "Beszámoló (v2)" + 10 "Beszámoló" + 11 "Adminisztrációs korlát túllépés" + 12 "Nem elérhető kritikus kiterjesztés" + 13 "Bizalmasság szükséges" + 14 "" + 15 "" + 16 "Nincs ilyen attribútum" + 17 "Definiálatlan típus" + 18 "Alkalmatlan egyezés" + 19 "Megszorítás megsértés" + 20 "Attribútum vagy érték létezik" + 21 "Érvénytelen szintakszis" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "Nincs ilyen objektum" + 33 "Álnév probléma" + 34 "Érvénytelen DN szintakszis" + 35 "Ez egy levél" + 36 "Álnév dereferencia probléma" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Nem megfelelő hitelesítés" + 49 "Érvénytelen azonosítók" + 50 "Nem elegendő jogok" + 51 "Foglalt" + 52 "Nem elérhető" + 53 "Nem akarja végrehajtani" + 54 "Ciklus találva" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "Rendezési vezérlés hiányzik" + 61 "Index tartomány hiba" + 62 "" + 63 "" + 64 "Elnevezési összeférhetetlenség" + 65 "Objektum osztály összeférhetetlenség" + 66 "Nem negedélyezett nem levélen" + 67 "Nem engedélyezett RDN-en" + 68 "Már létezik" + 69 "Nincsenek objektum osztály modok" + 70 "Eredmény túl nagy" + 71 "Több DSA-ra van hatással" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "Egyéb" + 81 "Kiszolgáló nem elérhető" + 82 "Helyi hiba" + 83 "Kódolási hiba" + 84 "Dekódolási hiba" + 85 "Időtúllépés" + 86 "Ismeretlen hitelesítés" + 87 "Szűrő hiba" + 88 "Felhasználó megszakította" + 89 "Paraméter hiba" + 90 "Nincs memória" + 91 "Nem tudok csatlakozni az LDAP kiszolgálóhoz" + 92 "A műveletet az LDAP protokoll ezen verziója nem támogatja" + 93 "A megadott vezérlő nem található az üzenetben" + 94 "Nincs eredmény az üzenetben" + 95 "Több eredmény jött vissza" + 96 "Ciklus a beszámolók kezelése közben" + 97 "Beszámolási ugrás limit túllépve" +}

1 0

Kovács András : devenum: Add Hungarian translation.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: e77622a179472d5fd14db7965378805af5712b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e77622a179472d5fd14db7965… Author: Kovács András <andras(a)csevego.net> Date: Mon Jun 28 23:26:53 2010 +0200 devenum: Add Hungarian translation. --- dlls/devenum/Hu.rc | 34 ++++++++++++++++++++++++++++++++++ dlls/devenum/Makefile.in | 1 + 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/devenum/Hu.rc b/dlls/devenum/Hu.rc new file mode 100644 index 0000000..91d4a0b --- /dev/null +++ b/dlls/devenum/Hu.rc @@ -0,0 +1,34 @@ +/* + * Resources for Device Enumerator + * + * Copyright 2010 Andras Kovacs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "devenum_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_DEVENUM_DSDEFAULT "Alapértelmezett DirectSound" + IDS_DEVENUM_DS "DirectSound: %s" + IDS_DEVENUM_WODEFAULT "Alapértelmezett WaveOut eszköz" + IDS_DEVENUM_MIDEFAULT "Alapértelmezett MidiOut eszköz" +} diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index df3c136..1b174a5 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -19,6 +19,7 @@ RC_SRCS = \ En.rc \ Es.rc \ Fr.rc \ + Hu.rc \ It.rc \ Ja.rc \ Ko.rc \

1 0

Igor Paliychuk : reg: Ukrainian translation update.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: 3762d1c9f8edcb7fc0a95f2bcbf18bfc940c9c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3762d1c9f8edcb7fc0a95f2bc… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Mon Jun 28 21:46:22 2010 +0300 reg: Ukrainian translation update. --- programs/reg/Uk.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/Uk.rc b/programs/reg/Uk.rc index 70c86f7..d2c776a 100644 --- a/programs/reg/Uk.rc +++ b/programs/reg/Uk.rc @@ -31,10 +31,10 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "Синтаксис цієї команди наступний:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n" - STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n" + STRING_USAGE, "Синтаксис цієї команди наступний:\n\nREG [ ADD | DELETE | QUERY ]\nREG <команда> /?\n" + STRING_ADD_USAGE, "REG ADD <ключ> [/v <параметр> | /ve] [/t <тип>] [/s <розділювач>] [/d дані] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE <ключ> [/v <параметр> | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY <ключ> [/v <параметр> | /ve] [/s]\n" STRING_SUCCESS, "Операція успішно завершена\n" STRING_INVALID_KEY, "Помилка: неправильне ім'я ключа\n" STRING_INVALID_CMDLINE, "Помилка: неправильні параметри командного рядка\n"

1 0

Igor Paliychuk : xcopy: Ukrainian translation update.
by Alexandre Julliard 29 Jun '10

29 Jun '10

Module: wine Branch: master Commit: f8a16d3b301088135847ed70b4bf6f4cb5bce2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a16d3b301088135847ed70b… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Mon Jun 28 21:45:49 2010 +0300 xcopy: Ukrainian translation update. --- programs/xcopy/Uk.rc | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/programs/xcopy/Uk.rc b/programs/xcopy/Uk.rc index 6d59e1b..eb0ec1f 100644 --- a/programs/xcopy/Uk.rc +++ b/programs/xcopy/Uk.rc @@ -34,8 +34,7 @@ STRINGTABLE STRING_PAUSE, "Натисніть <enter> щоб почати копіювання\n" STRING_SIMCOPY, "%d файл(ів) буде скопійовано\n" STRING_COPY, "%d файл(ів) скопійовано\n" - STRING_QISDIR, "'%s' є файлом чи директорією\n" \ - "on the target?\n" \ + STRING_QISDIR, "'%s' є файлом чи директорією?\n" \ "(F - Файл, D - Директорія)\n" STRING_SRCPROMPT,"%s? (Yes|No)\n" STRING_OVERWRITE,"Переписати %s? (Yes|No|All)\n" @@ -51,34 +50,34 @@ STRINGTABLE STRING_HELP, "XCOPY - Копіює файли та дерева директорій за призначенням\n\ \n\ -Syntax:\n\ +Синтаксис:\n\ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ -Where:\n\ +Де:\n\ \n\ -[/I] Assume directory if destination does not exist and copying 2 or\n\ -\tmore files\n\ +[/I] Якщо кінцева папка відсутня і копіюється бiльше одного файлу,\n\ +\tто припускається, що мiсце призначення є папкою\n\ [/S] Копіює директорії та піддиректорії\n\ [/E] Копіює директорії та піддиректорії, включно з порожніми\n\ -[/Q] Do not list names during copy, ie quiet.\n\ +[/Q] Не відображає імена файлів під час копіювання.\n\ [/F] Під час копіювання відображає повні імена початкових і кінцевих файлів\n\ -[/L] Simulate operation, showing names which would be copied\n\ +[/L] Виводить список файлів, які будуть скопійовані\n\ [/W] Питає підтвердження перед початком копіювання\n\ [/T] Створює структуру каталогів але не копіює файли\n\ -[/Y] Suppress prompting when overwriting files\n\ +[/Y] Придушує запит на підтвердження перезапису файлів\n\ [/-Y] Питає підтвердження на перезапис файлів\n\ -[/P] Prompts on each source file before copying\n\ +[/P] Питає підтвердження для кожного копійованого файлу\n\ [/N] Копіює, використовуючи короткі імена\n\ -[/U] Copy only files which already exist in destination\n\ +[/U] Копіює лише ті файли, як вже iснують в кінцевій папці\n\ [/R] Перезаписує файли, доступні лише для читання\n\ -[/H] Include hidden and system files in the copy\n\ -[/C] Продовжує роботу, навіть якщо при копіюванні виникла помилка\n\ +[/H] Копіює також приховані та системні файли\n\ +[/C] Продовжує роботу, навіть якщо при копіюванні сталася помилка\n\ [/A] Копіює лише файли з властивістю АРХІВНИЙ\n\ [/M] Копіює лише файли з властивістю АРХІВНИЙ, видаляє\n\ \властивість АРХІВНИЙ\n\ -[/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після вказаної дати.\n\ -\t\tЯкщо дата не вказана, only copy if destination is older\n\ -\t\tthan source\n\n" +[/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після вказаної\n\ +дати. Якщо дата не вказана, копіює лише ті файли, які новіші\n\ +в початковій папці\n\n" }

1 0