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

Michael Stefaniuc : krnl386.exe16: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 38ba364cc4c9c96fdeafe30743aa4f0eeac6f6a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38ba364cc4c9c96fdeafe307… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:23 2018 +0200 krnl386.exe16: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/error.c | 6 ++---- dlls/krnl386.exe16/int21.c | 8 +++----- dlls/krnl386.exe16/vxd.c | 4 +--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/krnl386.exe16/error.c b/dlls/krnl386.exe16/error.c index dc02d21..5508d7c 100644 --- a/dlls/krnl386.exe16/error.c +++ b/dlls/krnl386.exe16/error.c @@ -193,8 +193,6 @@ static const struct { }; #undef ErrorString -#define ErrorStringCount (sizeof(ErrorStrings) / sizeof(ErrorStrings[0])) -#define ParamErrorStringCount (sizeof(ParamErrorStrings) / sizeof(ParamErrorStrings[0])) /*********************************************************************** * GetErrorString (internal) @@ -204,7 +202,7 @@ static const char *GetErrorString(UINT16 uErr) static char buffer[80]; unsigned int n; - for (n = 0; n < ErrorStringCount; n++) { + for (n = 0; n < ARRAY_SIZE(ErrorStrings); n++) { if (uErr == ErrorStrings[n].constant) return ErrorStrings[n].name; } @@ -229,7 +227,7 @@ static const char *GetParamErrorString(UINT16 uErr) { { unsigned int n; - for (n = 0; n < ParamErrorStringCount; n++) { + for (n = 0; n < ARRAY_SIZE(ParamErrorStrings); n++) { if (uErr == ParamErrorStrings[n].constant) { strcat(buffer, ParamErrorStrings[n].name); return buffer; diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 3a08749..f32b1a7 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -282,8 +282,6 @@ static struct magic_device magic_devices[] = { {'h','p','s','c','a','n',0}, NULL, { { 0, 0 } }, INT21_IoctlHPScanHandler }, }; -#define NB_MAGIC_DEVICES (sizeof(magic_devices)/sizeof(magic_devices[0])) - /* Many calls translate a drive argument like this: drive number (00h = default, 01h = A:, etc) @@ -856,13 +854,13 @@ static HANDLE INT21_OpenMagicDevice( LPCWSTR name, DWORD access ) if ((p = strrchrW( name, '/' ))) name = p + 1; if ((p = strrchrW( name, '\\' ))) name = p + 1; - for (i = 0; i < NB_MAGIC_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(magic_devices); i++) { int len = strlenW( magic_devices[i].name ); if (!strncmpiW( magic_devices[i].name, name, len ) && (!name[len] || name[len] == '.' || name[len] == ':')) break; } - if (i == NB_MAGIC_DEVICES) return 0; + if (i == ARRAY_SIZE(magic_devices)) return 0; if (!magic_devices[i].handle) /* need to open it */ { @@ -2639,7 +2637,7 @@ static void INT21_Ioctl_Char( CONTEXT *context ) } } else { UINT i; - for (i = 0; i < NB_MAGIC_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(magic_devices); i++) { if (!magic_devices[i].handle) continue; if (magic_devices[i].index.QuadPart == info.IndexNumber.QuadPart) diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index 7be5f63..dc14600f 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -80,8 +80,6 @@ static struct vxdcall_service vxd_services[] = { {'v','w','i','n','3','2','.','v','x','d',0}, 0x002a, NULL, NULL } }; -#define NB_VXD_SERVICES (sizeof(vxd_services)/sizeof(vxd_services[0])) - #define W32S_APP2WINE(addr) ((addr)? (DWORD)(addr) + W32S_offset : 0) #define W32S_WINE2APP(addr) ((addr)? (DWORD)(addr) - W32S_offset : 0) @@ -293,7 +291,7 @@ void WINAPI DECLSPEC_HIDDEN __regs_VxDCall( CONTEXT *context ) DWORD service = stack32_pop( context ); RtlEnterCriticalSection( &vxd_section ); - for (i = 0; i < NB_VXD_SERVICES; i++) + for (i = 0; i < ARRAY_SIZE(vxd_services); i++) { if (HIWORD(service) != vxd_services[i].service) continue; if (!vxd_services[i].module) /* need to load it */

1 0

Michael Stefaniuc : glu32: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: de8c478c4305ecb8ea5138b4235adb3a4d521cc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8c478c4305ecb8ea5138b4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:21 2018 +0200 glu32: Avoid an ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 973e448..8f0a360 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -91,7 +91,6 @@ static const struct { GLuint err; const char *str; } errors[] = { GLU_NURBS_ERROR36, "null control point reference" }, { GLU_NURBS_ERROR37, "duplicate point on piecewise linear trimming curve" }, }; -#define NB_ERRORS (sizeof(errors) / sizeof(errors[0])) typedef void (*_GLUfuncptr)(void); @@ -148,7 +147,7 @@ const GLubyte * WINAPI wine_gluErrorString( GLenum errCode ) { unsigned int i; - for (i = 0; i < NB_ERRORS; i++) + for (i = 0; i < ARRAY_SIZE(errors); i++) if (errors[i].err == errCode) return (const GLubyte *)errors[i].str; return NULL; @@ -159,10 +158,10 @@ const GLubyte * WINAPI wine_gluErrorString( GLenum errCode ) */ const WCHAR * WINAPI wine_gluErrorUnicodeStringEXT( GLenum errCode ) { - static WCHAR errorsW[NB_ERRORS][64]; + static WCHAR errorsW[ARRAY_SIZE(errors)][64]; unsigned int i, j; - for (i = 0; i < NB_ERRORS; i++) + for (i = 0; i < ARRAY_SIZE(errors); i++) { if (errors[i].err != errCode) continue; if (!errorsW[i][0]) /* errors use only ASCII, do a simple mapping */

1 0

Michael Stefaniuc : mscoree: Use the more common ARRAY_SIZE spelling.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: b412c166b3bb1568f1359bb2cc42c5d3984f62bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b412c166b3bb1568f1359bb2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 00:21:23 2018 +0200 mscoree: Use the more common ARRAY_SIZE spelling. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 64f345d..0c933ca 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1607,7 +1607,6 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, } #define CHARS_IN_GUID 39 -#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) { @@ -1618,7 +1617,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0}; static const WCHAR wszInprocServer32[] = {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; static const WCHAR wszDLL[] = {'.','d','l','l',0}; - WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; + WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) + ARRAY_SIZE(wszInprocServer32) - 1]; MonoDomain *domain; MonoAssembly *assembly; ICLRRuntimeInfo *info = NULL;

1 0

Michael Stefaniuc : serialui: Replace a macro with ARRAY_SIZE.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 9477a0ad9129891ba05e75439a49acffff0bd623 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9477a0ad9129891ba05e7543… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:20 2018 +0200 serialui: Replace a macro with ARRAY_SIZE. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/serialui/confdlg.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index da14472..7797c23 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -112,36 +112,34 @@ typedef struct tagPARAM2STR } PARAM2STR, *LPPARAM2STR; typedef const PARAM2STR *LPCPARAM2STR; -#define SERIALUI_TABLESIZE(x) ((sizeof (x))/(sizeof (x[0]))) - static PARAM2STRDATA SERIALUI_Baud2StrData[]={ {110, "110"}, {300, "300"}, {600, "600"}, {1200, "1200"}, {2400, "2400"}, {4800, "4800"}, {9600, "9600"}, {14400, "14400"}, {19200, "19200"}, {38400L, "38400"}, {56000L, "56000"}, {57600L, "57600"}, {115200L, "115200"}, {128000L, "128000"}, {256000L, "256000"} }; -static PARAM2STR SERIALUI_Baud2Str={ SERIALUI_TABLESIZE(SERIALUI_Baud2StrData),SERIALUI_Baud2StrData }; +static PARAM2STR SERIALUI_Baud2Str={ ARRAY_SIZE(SERIALUI_Baud2StrData), SERIALUI_Baud2StrData }; static PARAM2STRDATA SERIALUI_Parity2StrData[]={ {NOPARITY,"None"}, {ODDPARITY,"Odd"}, {EVENPARITY,"Even"}, {MARKPARITY,"Mark"}, {SPACEPARITY,"Space"} }; -static PARAM2STR SERIALUI_Parity2Str={ SERIALUI_TABLESIZE(SERIALUI_Parity2StrData),SERIALUI_Parity2StrData }; +static PARAM2STR SERIALUI_Parity2Str={ ARRAY_SIZE(SERIALUI_Parity2StrData), SERIALUI_Parity2StrData }; static PARAM2STRDATA SERIALUI_Stop2StrData[]={ {ONESTOPBIT,"1"}, {ONE5STOPBITS,"1.5"}, {TWOSTOPBITS,"2"} }; -static PARAM2STR SERIALUI_Stop2Str={ SERIALUI_TABLESIZE(SERIALUI_Stop2StrData),SERIALUI_Stop2StrData }; +static PARAM2STR SERIALUI_Stop2Str={ ARRAY_SIZE(SERIALUI_Stop2StrData), SERIALUI_Stop2StrData }; static PARAM2STRDATA SERIALUI_Data2StrData[]={ {5,"5"}, {6,"6"}, {7,"7"}, {8, "8"}, {16,"16"} }; -static PARAM2STR SERIALUI_Data2Str={ SERIALUI_TABLESIZE(SERIALUI_Data2StrData),SERIALUI_Data2StrData }; +static PARAM2STR SERIALUI_Data2Str={ ARRAY_SIZE(SERIALUI_Data2StrData), SERIALUI_Data2StrData }; static PARAM2STRDATA SERIALUI_Flow2StrData[]={ {0,"None"}, {1,"Hardware (RTS/CTS)"}, {2,"Software (XON/XOFF)"} }; -static PARAM2STR SERIALUI_Flow2Str={ SERIALUI_TABLESIZE(SERIALUI_Flow2StrData),SERIALUI_Flow2StrData }; +static PARAM2STR SERIALUI_Flow2Str={ ARRAY_SIZE(SERIALUI_Flow2StrData), SERIALUI_Flow2StrData }; /* * Add all the fields to a combo box and highlight the current value

1 0

Zebediah Figura : psapi/tests: Avoid failing silently.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 42016f6f0e8b3990b570899479dbf5df1c2736cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=42016f6f0e8b3990b5708994… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 6 00:05:38 2018 +0200 psapi/tests: Avoid failing silently. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 3fec5d7..99d081f 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -819,23 +819,24 @@ START_TEST(psapi_main) IsWow64Process(GetCurrentProcess(), &wow64); hpSR = OpenProcess(STANDARD_RIGHTS_REQUIRED, FALSE, pid); + ok(!!hpSR, "got error %u\n", GetLastError()); hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); + ok(!!hpQI, "got error %u\n", GetLastError()); hpVR = OpenProcess(PROCESS_VM_READ, FALSE, pid); + ok(!!hpVR, "got error %u\n", GetLastError()); hpQV = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid); - - if(hpSR && hpQI && hpVR && hpQV) - { - test_EnumProcesses(); - test_EnumProcessModules(); - test_GetModuleInformation(); - test_GetPerformanceInfo(); - test_GetProcessMemoryInfo(); - test_GetMappedFileName(); - test_GetProcessImageFileName(); - test_GetModuleFileNameEx(); - test_GetModuleBaseName(); - test_ws_functions(); - } + ok(!!hpQV, "got error %u\n", GetLastError()); + + test_EnumProcesses(); + test_EnumProcessModules(); + test_GetModuleInformation(); + test_GetPerformanceInfo(); + test_GetProcessMemoryInfo(); + test_GetMappedFileName(); + test_GetProcessImageFileName(); + test_GetModuleFileNameEx(); + test_GetModuleBaseName(); + test_ws_functions(); CloseHandle(hpSR); CloseHandle(hpQI);

1 0

Alexandre Julliard : comctl32/taskdialog: Fix pointer cast warnings.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 35289f81a469d0280f40d91475473df9bdd6f8fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=35289f81a469d0280f40d914… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 6 20:51:07 2018 +0200 comctl32/taskdialog: Fix pointer cast warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 42d50a9..ee3b273 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -488,7 +488,7 @@ static void taskdialog_add_radio_buttons(struct taskdialog_info *dialog_info) textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pRadioButtons[i].pszButtonText); dialog_info->radio_buttons[i] = CreateWindowW(WC_BUTTONW, textW, i == 0 ? style | WS_GROUP : style, 0, 0, 0, 0, dialog_info->hwnd, - (HMENU)taskconfig->pRadioButtons[i].nButtonID, 0, NULL); + ULongToHandle(taskconfig->pRadioButtons[i].nButtonID), 0, NULL); SendMessageW(dialog_info->radio_buttons[i], WM_SETFONT, (WPARAM)dialog_info->font, 0); Free(textW); } @@ -514,7 +514,7 @@ static void taskdialog_add_command_links(struct taskdialog_info *dialog_info) style = is_default ? default_style | BS_DEFCOMMANDLINK : default_style | BS_COMMANDLINK; textW = taskdialog_gettext(dialog_info, TRUE, taskconfig->pButtons[i].pszButtonText); dialog_info->command_links[i] = CreateWindowW(WC_BUTTONW, textW, style, 0, 0, 0, 0, dialog_info->hwnd, - (HMENU)taskconfig->pButtons[i].nButtonID, 0, NULL); + ULongToHandle(taskconfig->pButtons[i].nButtonID), 0, NULL); SendMessageW(dialog_info->command_links[i], WM_SETFONT, (WPARAM)dialog_info->font, 0); Free(textW);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 390532d447d7988aea5266ee5fb4709b0f7fe479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=390532d447d7988aea5266ee… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Jul 6 17:07:49 2018 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/po/fi.po b/po/fi.po index d2d9a47..c563ff6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -15627,41 +15627,6 @@ msgid "D" msgstr "H" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15724,6 +15689,7 @@ msgstr "" "[/A] Kopioi vain tiedostot, joilla on arkistointiattribuutti.\n" "[/M] Kopioi vain tiedostot, joilla on arkistointiattribuutti, ja\n" "\tpoista arkistointiattribuutti.\n" +"[/K] Kopioi myös attribuutit. Muuten attribuutit eivät säily.\n" "[/D | /D:k-p-v] Kopioi uudet tiedostot tai ne, joita on muokattu annetun\n" "\t\tpäivän jälkeen. Jos päivää ei anneta, kopioi vain, jos\n" "\t\tkohde on vanhempi kuin lähde.\n"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 6176bc0842d87315b76e0d6505a6007b82accc76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6176bc0842d87315b76e0d65… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jul 6 09:09:09 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0a6f2dc..c2fca3a 100644 --- a/po/lt.po +++ b/po/lt.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: 2018-07-04 20:40+0300\n" +"PO-Revision-Date: 2018-07-06 09:07+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -15669,41 +15669,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15767,6 +15732,7 @@ msgstr "" "[/A] Kopijuoti tik failus su nustatytu archyvavimo požymiu.\n" "[/M] Kopijuoti tik failus su nustatytu archyvavimo požymiu, pašalinti\n" "\tarchyvavimo požymį.\n" +"[/K] Kopijuoti failų požymius, be šio požymiai neišlaikomi.\n" "[/D | /D:m-d-y] Kopijuoti naujus failus arba modifikuotos po nurodytos " "datos.\n" "\t\tJei data nenurodyta, kopijuoti tik jei paskirties failas yra\n"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 44e5a7f0da9d7d824c89fb8a6c1a854bf92d78d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e5a7f0da9d7d824c89fb8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 6 09:19:22 2018 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/po/ru.po b/po/ru.po index 45dd3a1..9caec7d 100644 --- a/po/ru.po +++ b/po/ru.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: 2018-07-04 13:51+0300\n" +"PO-Revision-Date: 2018-07-06 09:17+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -15658,41 +15658,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15756,6 +15721,7 @@ msgstr "" "[/A] Копирует только файлы с атрибутом «архивный».\n" "[/M] Копирует только файлы с атрибутом «архивный»,\n" "при этом очищает атрибут.\n" +"[/K] Копирует атрибуты, без этого ключа атрибуты не копируются.\n" "[/D | /D:m-d-y] Копирует только новые файлы или файлы, изменённые\n" "\t\tпосле указанной даты. Если дата не указана, заменяет все старые файлы\n" "\t\tсуществующими новыми.\n"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard July 5, 2018

July 5, 2018

Module: wine Branch: master Commit: 6d13c66dd50a6e1cbb2814ded6f39fa72e41a13d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d13c66dd50a6e1cbb2814de… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jul 5 11:58:12 2018 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/po/de.po b/po/de.po index a05fee9..2b4f422 100644 --- a/po/de.po +++ b/po/de.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: 2018-05-18 15:21+0200\n" +"PO-Revision-Date: 2018-07-05 11:58+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3437,32 +3437,24 @@ msgid "Publishers..." msgstr "Herausgeber..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "LAN-Verbindung" +msgstr "Verbindungen" #: inetcpl.rc:125 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Lokaler Server" +msgstr "Proxyserver" #: inetcpl.rc:126 msgid "Use a proxy server" -msgstr "" +msgstr "Proxy verwenden" #: inetcpl.rc:127 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adresse" +msgstr "Adresse:" #: inetcpl.rc:129 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Keine Ports" +msgstr "Port:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -12919,10 +12911,8 @@ msgid "Confirm Value Delete" msgstr "Löschen des Wertes bestätigen" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Sind Sie sicher, dass Sie den Wert '%1' löschen möchten?" +msgstr "Sind Sie sicher, dass Sie den ausgewählten Wert löschen möchten?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -14911,6 +14901,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Ein Programm auf Ihrem System ist abgestürzt, aber WineDbg konnte nicht an " +"den Prozess anknüpfen, um eine Backtrace zu erstellen." #: winedbg.rc:41 msgid "(unidentified)"

1 0