wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

André Hentschel : dbghelp: Implement arm_map_dwarf_register.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 4055b7f2c31f10b67b19c3d54a4a659c7115cc4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4055b7f2c31f10b67b19c3d54… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:32:30 2011 +0200 dbghelp: Implement arm_map_dwarf_register. --- dlls/dbghelp/cpu_arm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 4365828..2dd20a0 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -54,8 +54,11 @@ static BOOL arm_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CON static unsigned arm_map_dwarf_register(unsigned regno) { - FIXME("not done for ARM\n"); - return 0; + if (regno <= 15) return CV_ARM_R0 + regno; + if (regno == 128) return CV_ARM_CPSR; + + FIXME("Don't know how to map register %d\n", regno); + return CV_ARM_NOREG; } static void* arm_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size)

1 0

André Hentschel : ntdll: Fix setting the ExceptionAddress on ARM.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: a38f7e86be637d3eaf169b9bd0e7b664afbf963c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38f7e86be637d3eaf169b9bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:32:05 2011 +0200 ntdll: Fix setting the ExceptionAddress on ARM. --- dlls/ntdll/signal_arm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 992b63c..0934164 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -493,7 +493,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) } rec.ExceptionFlags = EXCEPTION_CONTINUABLE; rec.ExceptionRecord = NULL; - /*rec.ExceptionAddress = (LPVOID)context.Iar;*/ + rec.ExceptionAddress = (LPVOID)context.Pc; rec.NumberParameters = 0; status = raise_exception( &rec, &context, TRUE ); if (status) raise_status( status, &rec ); @@ -519,7 +519,7 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = CONTROL_C_EXIT; rec.ExceptionFlags = EXCEPTION_CONTINUABLE; rec.ExceptionRecord = NULL; - /*rec.ExceptionAddress = (LPVOID)context.Iar;*/ + rec.ExceptionAddress = (LPVOID)context.Pc; rec.NumberParameters = 0; status = raise_exception( &rec, &context, TRUE ); if (status) raise_status( status, &rec ); @@ -543,7 +543,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_WINE_ASSERTION; rec.ExceptionFlags = EH_NONCONTINUABLE; rec.ExceptionRecord = NULL; - /*rec.ExceptionAddress = (LPVOID)context.Iar;*/ + rec.ExceptionAddress = (LPVOID)context.Pc; rec.NumberParameters = 0; status = raise_exception( &rec, &context, TRUE ); if (status) raise_status( status, &rec ); @@ -726,7 +726,7 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) NTSTATUS status; RtlCaptureContext( &context ); - /*rec->ExceptionAddress = (void *)context.Iar;*/ + rec->ExceptionAddress = (LPVOID)context.Pc; status = raise_exception( rec, &context, TRUE ); if (status) raise_status( status, rec ); }

1 0

André Hentschel : winedbg: Add more ARM registers to the map.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: be729282cea1fa75aeff4bf7136ffed1906140da URL: http://source.winehq.org/git/wine.git/?a=commit;h=be729282cea1fa75aeff4bf71… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:19:44 2011 +0200 winedbg: Add more ARM registers to the map. --- programs/winedbg/gdbproxy.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 3c86950..fae1582 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -441,6 +441,9 @@ static size_t cpu_register_map[] = { FIELD_OFFSET(CONTEXT, R10), FIELD_OFFSET(CONTEXT, Fp), FIELD_OFFSET(CONTEXT, Ip), + FIELD_OFFSET(CONTEXT, Sp), + FIELD_OFFSET(CONTEXT, Lr), + FIELD_OFFSET(CONTEXT, Pc), }; #else # error Define the registers map for your CPU

1 0

André Hentschel : winedbg: Add ARM string for minidump .
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 3c699c09581b9f38692698cf07618b2380628072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c699c09581b9f38692698cf0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:19:38 2011 +0200 winedbg: Add ARM string for minidump. --- programs/winedbg/tgt_minidump.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index c24fd8c..142d5ca 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -264,6 +264,9 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) case PROCESSOR_ARCHITECTURE_AMD64: str = "X86_64"; break; + case PROCESSOR_ARCHITECTURE_ARM: + str = "ARM"; + break; default: str = "???"; break;

1 0

André Hentschel : include: Add more cv_call types.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 14aefc1e4a59c75cf955833bee21f7fc29b1c620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14aefc1e4a59c75cf955833be… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 15 19:19:29 2011 +0200 include: Add more cv_call types. --- include/cvconst.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index 1599a26..d05c99b 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -559,5 +559,11 @@ typedef enum CV_call_e CV_CALL_GENERIC, CV_CALL_ALPHACALL, CV_CALL_PPCCALL, + CV_CALL_SHCALL, + CV_CALL_ARMCALL, + CV_CALL_AM33CALL, + CV_CALL_TRICALL, + CV_CALL_SH5CALL, + CV_CALL_M32RCALL, CV_CALL_RESERVED, } CV_call_e;

1 0

Alexandre Julliard : regedit: Remove unnecessary use of class atoms.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: dcc9c37e979321b3d7f02efd22299fc6a9106e31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc9c37e979321b3d7f02efd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 18 12:08:31 2011 +0200 regedit: Remove unnecessary use of class atoms. --- programs/regedit/main.c | 31 +++++++------------------------ 1 files changed, 7 insertions(+), 24 deletions(-) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index b055d7b..d764702 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -63,8 +63,9 @@ WCHAR szTitle[MAX_LOADSTRING]; const WCHAR szFrameClass[] = {'R','E','G','E','D','I','T','_','F','R','A','M','E',0}; const WCHAR szChildClass[] = {'R','E','G','E','D','I','T',0}; -static BOOL RegisterWindowClasses(HINSTANCE hInstance, ATOM *hFrameWndClass, ATOM *hChildWndClass) +static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { + WCHAR empty = 0; WNDCLASSEXW wndclass = {0}; /* Frame class */ @@ -75,33 +76,15 @@ static BOOL RegisterWindowClasses(HINSTANCE hInstance, ATOM *hFrameWndClass, ATO wndclass.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_REGEDIT)); wndclass.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wndclass.lpszClassName = szFrameClass; - wndclass.hIconSm = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_REGEDIT), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), LR_SHARED); - - if (!(*hFrameWndClass = RegisterClassExW(&wndclass))) - return FALSE; + wndclass.hIconSm = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_REGEDIT), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); + RegisterClassExW(&wndclass); /* Child class */ wndclass.lpfnWndProc = ChildWndProc; wndclass.cbWndExtra = sizeof(HANDLE); wndclass.lpszClassName = szChildClass; - - if (!(*hChildWndClass = RegisterClassExW(&wndclass))) - { - UnregisterClassW(szFrameClass, hInstance); - return FALSE; - } - - return TRUE; -} - -static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) -{ - WCHAR empty = 0; - ATOM hFrameWndClass, hChildWndClass; - - if (!RegisterWindowClasses(hInstance, &hFrameWndClass, &hChildWndClass)) - return FALSE; + RegisterClassExW(&wndclass); hMenuFrame = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDR_REGEDIT_MENU)); hPopupMenus = LoadMenuW(hInstance, MAKEINTRESOURCEW(IDR_POPUP_MENUS)); @@ -114,7 +97,7 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) nClipboardFormat = RegisterClipboardFormatW(strClipboardFormat); - hFrameWnd = CreateWindowExW(0, MAKEINTRESOURCEW(hFrameWndClass), szTitle, + hFrameWnd = CreateWindowExW(0, szFrameClass, szTitle, WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, hMenuFrame, hInstance, NULL/*lpParam*/);

1 0

Gerald Pfeifer : wine: Use { } instead of ; for an empty basic block.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 309a8c8d48b7daa790253146f24564e65fa6b287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=309a8c8d48b7daa790253146f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Apr 17 01:23:32 2011 +0200 wine: Use { } instead of ; for an empty basic block. --- dlls/krnl386.exe16/instr.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index 61f92ab..5db0b2b 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -632,11 +632,13 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) int seg = outp ? context->SegDs : context->SegEs; /* FIXME: is this right? */ if (outp) + { /* FIXME: Check segment is readable. */ - ; + } else + { /* FIXME: Check segment is writable. */ - ; + } if (repX) {

1 0

Juan Lang : wintrust: Implement IsCatalogFile.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 3effba78051a7309a443c36b8c3ca4d5aca85386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3effba78051a7309a443c36b8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Apr 16 10:30:34 2011 -0700 wintrust: Implement IsCatalogFile. --- dlls/wintrust/wintrust.spec | 2 +- dlls/wintrust/wintrust_main.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 0627711..53a2468 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -50,7 +50,7 @@ @ stdcall GenericChainFinalProv(ptr) @ stdcall HTTPSCertificateTrust(ptr) @ stdcall HTTPSFinalProv(ptr) -@ stub IsCatalogFile +@ stdcall IsCatalogFile(ptr wstr) @ stub MsCatConstructHashTag @ stub MsCatFreeHashTag @ stub OfficeCleanupPolicy diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 1c87b6e..302b2bd 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -1201,3 +1201,18 @@ HRESULT WINAPI WTHelperCertCheckValidSignature(CRYPT_PROVIDER_DATA *pProvData) FIXME("Stub\n"); return S_OK; } + +/*********************************************************************** + * IsCatalogFile + */ +BOOL WINAPI IsCatalogFile(HANDLE hFile, WCHAR *pwszFileName) +{ + static const GUID catGUID = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + GUID guid; + + TRACE("(%p, %s)\n", hFile, debugstr_w(pwszFileName)); + + if (!CryptSIPRetrieveSubjectGuid(pwszFileName, hFile, &guid)) + return FALSE; + return IsEqualGUID(&guid, &catGUID); +}

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 043bdc16a57121a063967ce4505e84a3112fdb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=043bdc16a57121a063967ce45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 17 17:49:49 2011 +0400 po: Update Russian translation. --- po/ru.po | 100 ++++++++++++++++++++++--------------------------------------- 1 files changed, 36 insertions(+), 64 deletions(-) diff --git a/po/ru.po b/po/ru.po index 55404a0..989eb87 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-02-11 05:35+0300\n" -"Last-Translator: Alexander Lakhin <exclusion(a)gmail.com>\n" +"PO-Revision-Date: 2011-04-17 17:06+0300\n" +"Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: none\n" "Language: Russian\n" "MIME-Version: 1.0\n" @@ -2008,13 +2008,12 @@ msgid "Default MidiOut Device" msgstr "Устройство вывода MIDI по умолчанию" #: dxdiagn.rc:25 -#, fuzzy msgid "Regional Setting" -msgstr "Установки по умолчанию" +msgstr "Региональные настройки" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" -msgstr "" +msgstr "%uМБ используется, %uМБ доступно" #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155 msgid "Options" @@ -2173,36 +2172,32 @@ msgid "Configure Wine Internet Browser and related settings" msgstr "Настройка браузера Wine и связанных параметров" #: inetcpl.rc:30 -#, fuzzy msgid "Security settings for zone: " -msgstr "&Сохранять настройки при выходе" +msgstr "Настройки безопасности для зоны: " #: inetcpl.rc:31 -#, fuzzy msgid "Custom" -msgstr "Персонализовать" +msgstr "Пользовательский" #: inetcpl.rc:32 msgid "Very Low" -msgstr "" +msgstr "Очень низкий" #: inetcpl.rc:33 -#, fuzzy msgid "Low" -msgstr "&Низкая" +msgstr "Низкий" #: inetcpl.rc:34 msgid "Medium" -msgstr "" +msgstr "Средний" #: inetcpl.rc:35 msgid "Increased" -msgstr "" +msgstr "Повышенный" #: inetcpl.rc:36 -#, fuzzy msgid "High" -msgstr "&Высокая" +msgstr "Высокий" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -2825,9 +2820,8 @@ msgid "Signal pending\n" msgstr "Сигнал обрабатывается\n" #: winerror.mc:681 -#, fuzzy msgid "Max system-wide thread count reached\n" -msgstr "Невозможно создать дополнительный поток\n" +msgstr "Создано максимально возможное количество потоков\n" #: winerror.mc:686 msgid "Lock failed\n" @@ -4254,9 +4248,8 @@ msgid "Private dialog index\n" msgstr "Индекс частного диалога\n" #: winerror.mc:2476 -#, fuzzy msgid "List box ID not found\n" -msgstr "Код списка не найден\n" +msgstr "Идентификатор элемента \"Список\" не найден\n" #: winerror.mc:2481 msgid "No wildcard characters\n" @@ -4319,18 +4312,16 @@ msgid "Hook procedure not installed\n" msgstr "Процедура обработчика не установлена\n" #: winerror.mc:2556 -#, fuzzy msgid "Invalid list box message\n" -msgstr "Неверное сообщение для списка\n" +msgstr "Неверное сообщение для элемента \"Список\"\n" #: winerror.mc:2561 msgid "Invalid LB_SETCOUNT sent\n" msgstr "Послано неверное сообщение LB_SETCOUNT\n" #: winerror.mc:2566 -#, fuzzy msgid "No tab stops on this list box\n" -msgstr "Список не поддерживает позиции табуляции\n" +msgstr "Элемент \"Список\" не имеет позиции табуляции\n" #: winerror.mc:2571 msgid "Can't destroy object owned by another thread\n" @@ -4345,9 +4336,8 @@ msgid "Window has no system menu\n" msgstr "У окна нет системного меню\n" #: winerror.mc:2586 -#, fuzzy msgid "Invalid message box style\n" -msgstr "Неверный стиль окна сообщения\n" +msgstr "Неверный стиль окна-сообщения\n" #: winerror.mc:2591 msgid "Invalid SPI parameter\n" @@ -4398,7 +4388,6 @@ msgid "No system resources\n" msgstr "Недостаточно системных ресурсов\n" #: winerror.mc:2651 -#, fuzzy msgid "No non-paged system resources\n" msgstr "Недостаточно невыгружаемых системных ресурсов\n" @@ -4411,9 +4400,8 @@ msgid "No working set quota\n" msgstr "Превышена квота рабочего набора\n" #: winerror.mc:2666 -#, fuzzy msgid "No page file quota\n" -msgstr "Превышена квота файла подкачки\n" +msgstr "Не задана квота файла подкачки\n" #: winerror.mc:2671 msgid "Exceeded commitment limit\n" @@ -4488,7 +4476,6 @@ msgid "Unknown component\n" msgstr "Неизвестный компонент\n" #: winerror.mc:2761 -#, fuzzy msgid "Unknown property\n" msgstr "Неизвестное свойство\n" @@ -5021,7 +5008,6 @@ msgid "Invalid printer command\n" msgstr "Неверная команда принтеру\n" #: winerror.mc:3431 -#, fuzzy msgid "Invalid data type\n" msgstr "Неверный тип данных\n" @@ -5334,7 +5320,6 @@ msgid "insert disk %s" msgstr "вставьте диск %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -6915,13 +6900,12 @@ msgid "An invalid parameter was passed to a system function." msgstr "Недопустимый параметр передан системной функции." #: winmm.rc:42 -#, fuzzy msgid "" "The specified format is not supported or cannot be translated. Use the " "Capabilities function to determine the supported formats." msgstr "" -"Указанный формат не поддерживается или не может быть оттранслирован. " -"Используйте функцию Capabilities, чтобы определить поддерживаемые форматы." +"Указанный формат не поддерживается или не может быть преобразован. " +"Используйте функцию Возможности, чтобы определить поддерживаемые форматы." #: winmm.rc:43 winmm.rc:49 msgid "" @@ -7111,13 +7095,12 @@ msgstr "" "команде." #: winmm.rc:77 -#, fuzzy msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." msgstr "" "Ошибки в нескольких устройствах. Укажите отдельно каждую команду и " -"устройство, чтобы определить, какие устройства вызывали ошибки." +"устройство, чтобы определить устройство, вызвавшее ошибку." #: winmm.rc:78 msgid "Cannot determine the device type from the given filename extension." @@ -7738,9 +7721,8 @@ msgid "&Always on Top" msgstr "&Поверх всех" #: clock.rc:42 -#, fuzzy msgid "&About Clock" -msgstr "&О программе..." +msgstr "&О Часах" #: clock.rc:48 msgid "Clock" @@ -8029,9 +8011,8 @@ msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "Справка о REN\n" #: cmd.rc:158 -#, fuzzy msgid "RENAME <filename> renames a file.\n" -msgstr "Справка о RENAME\n" +msgstr "RENAME <имя файла> переименовывает файл.\n" #: cmd.rc:160 msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" @@ -8127,9 +8108,8 @@ msgstr "" "Флаг verify не используется Wine.\n" #: cmd.rc:204 -#, fuzzy msgid "VER displays the version of cmd you are running.\n" -msgstr "VER отображает версию запущенного cmd\n" +msgstr "VER выводит версию используемого cmd\n" #: cmd.rc:206 msgid "VOL shows the volume label of a disk device.\n" @@ -8627,9 +8607,8 @@ msgid "&Replace...\tCtrl+H" msgstr "&Заменить...\tCtrl+H" #: notepad.rc:58 progman.rc:53 regedit.rc:78 winefile.rc:86 -#, fuzzy msgid "&Contents\tF1" -msgstr "&Содержание" +msgstr "&Содержание\tF1" #: notepad.rc:59 msgid "&About Notepad" @@ -9089,9 +9068,8 @@ msgid "&Arrange Icons" msgstr "&Упорядочить при выходе" #: progman.rc:54 -#, fuzzy msgid "&About Program Manager" -msgstr "Диспетчер программ" +msgstr "&О диспетчере программ" #: progman.rc:60 msgid "Program Manager" @@ -9251,9 +9229,8 @@ msgid "&Multi String Value" msgstr "&Многостроковый параметр" #: regedit.rc:52 regedit.rc:103 -#, fuzzy msgid "&Expandable String Value" -msgstr "&Строковый параметр" +msgstr "&Вычисляемый строковый параметр" #: regedit.rc:56 regedit.rc:107 msgid "&Rename\tF2" @@ -10371,15 +10348,15 @@ msgid "CD-ROM" msgstr "CD-ROM" #: winecfg.rc:86 -#, fuzzy msgid "" "You cannot add any more drives.\n" "\n" "Each drive must have a letter, from A to Z, so you cannot have more than 26." msgstr "" -"Невозможно создать новый диск.\n" +"Невозможно добавить ещё один диск.\n" "\n" -"У каждого диска должна быть буква - от A до Z, и у вас уже 26 дисков." +"Каждый диск имеет букву - от A до Z, поэтому общее количество дисков " +"ограничено 26-ю." #: winecfg.rc:87 msgid "System drive" @@ -10840,9 +10817,8 @@ msgid "Arrange &Symbols" msgstr "&Расположить" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File" -msgstr "&О Winefile..." +msgstr "&О Wine File" #: winefile.rc:93 msgid "Applying font settings" @@ -10906,7 +10882,7 @@ msgstr "%s из %s свободно" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "&Игра" #: winemine.rc:35 msgid "&New\tF2" @@ -10914,7 +10890,7 @@ msgstr "&Новая игра\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "Вопросительные &знаки" #: winemine.rc:39 msgid "&Beginner" @@ -10933,14 +10909,12 @@ msgid "&Custom..." msgstr "Нестандартные &параметры" #: winemine.rc:44 -#, fuzzy msgid "&Fastest Times" -msgstr "&Лучшее время" +msgstr "&Лучшие результаты" #: winemine.rc:49 -#, fuzzy msgid "&About WineMine" -msgstr "&О Wine" +msgstr "&О WineMine" #: winemine.rc:27 msgid "WineMine" @@ -10991,9 +10965,8 @@ msgid "Large" msgstr "Крупный" #: winhlp32.rc:54 -#, fuzzy msgid "&Help on help\tF1" -msgstr "&Использование справки" +msgstr "&Справка о справочной программе" #: winhlp32.rc:55 msgid "Always on &top" @@ -11152,9 +11125,8 @@ msgid "&System\tCtrl+1" msgstr "&Системный\tCtrl+1" #: wordpad.rc:88 -#, fuzzy msgid "&Pale yellow\tCtrl+2" -msgstr "&Желтоватый PostThat\tCtrl+2" +msgstr "&Светло-жёлтый\tCtrl+2" #: wordpad.rc:93 msgid "&About Wine Wordpad"

1 0

Nikolay Sivov : inetcpl: Update Russian resource.
by Alexandre Julliard 18 Apr '11

18 Apr '11

Module: wine Branch: master Commit: 08f767c0740ea45b225dfd9338c5968f75f10b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f767c0740ea45b225dfd933… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 17 16:21:54 2011 +0400 inetcpl: Update Russian resource. --- dlls/inetcpl.cpl/cpl_Ru.rc | 49 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Ru.rc b/dlls/inetcpl.cpl/cpl_Ru.rc index a497210..98b809d 100644 --- a/dlls/inetcpl.cpl/cpl_Ru.rc +++ b/dlls/inetcpl.cpl/cpl_Ru.rc @@ -40,11 +40,52 @@ BEGIN PUSHBUTTON "&Текущая страница", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "&По умолчанию", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "Пу&стая страница", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " История использования браузера ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Вы можете удалить кэшированные страницы, файлы cookies и другие данные.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "Удалить &файлы...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "&Настройки...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + +END + +/* "Delete browsing history" dialog */ +IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Очистка истории" +BEGIN + + AUTOCHECKBOX "Временные файлы\nКэшированные копии страниц, изображений и сертификатов.", + IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Файлы cookies\nФайлы, сохранённые на вашем компьютере, могут содержать пользовательские настройки и информацию для авторизации.", + IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "История\nПеречень сайтов, к которым осуществлялся доступ.", + IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Данные веб-форм\nИмена пользователя и другая информация, которая использовалась при заполнении форм.", + IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Пароли\nСохранённые пароли, которые были указаны в веб-формах.", + IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "Отмена", IDCANCEL, 185, 230, 60, 15, WS_GROUP + PUSHBUTTON "Удалить", IDOK, 120, 230, 60, 15, WS_GROUP + +END + +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Безопасность" +BEGIN + + CONTROL "Listview", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 + LTEXT "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20 + GROUPBOX "", IDC_SEC_GROUP, 4, 88, 312, 126 + CONTROL "trackbar", IDC_SEC_TRACKBAR, "msctls_trackbar32", + TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100 + LTEXT "", IDC_SEC_LEVEL, 48, 102, 180, 12 + LTEXT "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80 END

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
94
Older →

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-commits April 2011