September 2008 - Wine-commits

Eric Pouech : dbghelp: Silence 0x112c symbol type.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 2f98c59adbc3f72b074d4a263e28a573df53423b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f98c59adbc3f72b074d4a263… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Sep 6 22:20:13 2008 +0200 dbghelp: Silence 0x112c symbol type. --- dlls/dbghelp/msc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index da6c710..1a28091 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1746,6 +1746,10 @@ static int codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root TRACE("S-Align V1\n"); break; + case 0x112c: + TRACE("Unsupported symbol id %x\n", sym->generic.id); + break; + default: FIXME("Unsupported symbol id %x\n", sym->generic.id); dump(sym, 2 + sym->generic.len);

1 0

Eric Pouech : winedbg: Also handle 1 byte signed int as they were char ( PDB files are done like this... sigh).
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: a181ad5a2cb285238abe541c0dc9e52b4865b280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a181ad5a2cb285238abe541c0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Sep 6 22:20:00 2008 +0200 winedbg: Also handle 1 byte signed int as they were char (PDB files are done like this... sigh). --- programs/winedbg/memory.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 9a400e5..dfb014e 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -340,6 +340,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) case btInt: case btLong: if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; + if (size == 1) goto print_char; dbg_print_longlong(val_int, TRUE); break; case btUInt: @@ -354,6 +355,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) case btChar: if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; /* FIXME: should do the same for a Unicode character (size == 2) */ + print_char: if (size == 1 && (val_int < 0x20 || val_int > 0x80)) dbg_printf("%d", (int)val_int); else @@ -381,8 +383,8 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) if (!types_get_real_type(&sub_type, &tag)) return; if (types_get_info(&sub_type, TI_GET_SYMTAG, &tag) && tag == SymTagBaseType && - types_get_info(&sub_type, TI_GET_BASETYPE, &bt) && bt == btChar && - types_get_info(&sub_type, TI_GET_LENGTH, &size64)) + types_get_info(&sub_type, TI_GET_BASETYPE, &bt) && (bt == btChar || bt == btInt) && + types_get_info(&sub_type, TI_GET_LENGTH, &size64) && size64 == 1) { char buffer[1024];

1 0

Eric Pouech : dbghelp: Use the correct size for global variable when searching for a symbol.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 5ad756fb3ca734c8f2906d6c5b8c91b85ceba6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad756fb3ca734c8f2906d6c5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Sep 6 22:20:06 2008 +0200 dbghelp: Use the correct size for global variable when searching for a symbol. --- dlls/dbghelp/symbol.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index f4f2d11..a4a1683 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -715,6 +715,18 @@ static BOOL resort_symbols(struct module* module) return module->sortlist_valid = TRUE; } +static void symt_get_length(struct symt* symt, ULONG64* size) +{ + DWORD type_index; + + if (symt_get_info(symt, TI_GET_LENGTH, size) && *size) + return; + + if (symt_get_info(symt, TI_GET_TYPE, &type_index) && + symt_get_info((struct symt*)type_index, TI_GET_LENGTH, size)) return; + *size = 0x1000; /* arbitrary value */ +} + /* assume addr is in module */ struct symt_ht* symt_find_nearest(struct module* module, DWORD addr) { @@ -737,8 +749,7 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD addr) if (high) { symt_get_info(&module->addr_sorttab[high - 1]->symt, TI_GET_ADDRESS, &ref_addr); - if (!symt_get_info(&module->addr_sorttab[high - 1]->symt, TI_GET_LENGTH, &ref_size) || !ref_size) - ref_size = 0x1000; /* arbitrary value */ + symt_get_length(&module->addr_sorttab[high - 1]->symt, &ref_size); if (addr >= ref_addr + ref_size) return NULL; } @@ -772,8 +783,7 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD addr) /* finally check that we fit into the found symbol */ symt_get_info(&module->addr_sorttab[low]->symt, TI_GET_ADDRESS, &ref_addr); if (addr < ref_addr) return NULL; - if (!symt_get_info(&module->addr_sorttab[high - 1]->symt, TI_GET_LENGTH, &ref_size) || !ref_size) - ref_size = 0x1000; /* arbitrary value */ + symt_get_length(&module->addr_sorttab[low]->symt, &ref_size); if (addr >= ref_addr + ref_size) return NULL; return module->addr_sorttab[low];

1 0

Eric Pouech : dbghelp: Correctly setup the Unix regular expression for matching file names in SymEnumLines .
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 418a001e00250ac68de12a555564e3921e43d92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=418a001e00250ac68de12a555… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Sep 6 22:19:53 2008 +0200 dbghelp: Correctly setup the Unix regular expression for matching file names in SymEnumLines. Plug a potential memory leak as well. --- dlls/dbghelp/source.c | 58 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index 14a48cc..d02a392 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -154,6 +154,55 @@ BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, PCSTR Mask, return TRUE; } +static inline void re_append(char** mask, unsigned* len, char ch) +{ + *mask = HeapReAlloc(GetProcessHeap(), 0, *mask, ++(*len)); + (*mask)[*len - 2] = ch; +} + +static BOOL compile_regex(regex_t* re, const char* srcfile) +{ + char* mask; + unsigned len = 1; + + mask = HeapAlloc(GetProcessHeap(), 0, 1); + re_append(&mask, &len, '^'); + if (!srcfile || !*srcfile) re_append(&mask, &len, '*'); + else while (*srcfile) + { + switch (*srcfile) + { + case '\\': + case '/': + re_append(&mask, &len, '['); + re_append(&mask, &len, '\\'); + re_append(&mask, &len, '\\'); + re_append(&mask, &len, '/'); + re_append(&mask, &len, ']'); + break; + case '.': + re_append(&mask, &len, '\\'); + re_append(&mask, &len, '.'); + break; + default: + re_append(&mask, &len, *srcfile); + break; + } + srcfile++; + } + re_append(&mask, &len, '$'); + mask[len - 1] = '\0'; + len = regcomp(re, mask, REG_NOSUB); + HeapFree(GetProcessHeap(), 0, mask); + if (len) + { + FIXME("Couldn't compile %s\n", mask); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return TRUE; +} + /****************************************************************** * SymEnumLines (DBGHELP.@) * @@ -172,17 +221,13 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, if (!cb) return FALSE; if (!(dbghelp_options & SYMOPT_LOAD_LINES)) return TRUE; - if (regcomp(&re, srcfile, REG_NOSUB)) - { - FIXME("Couldn't compile %s\n", srcfile); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + pair.pcs = process_find_by_handle(hProcess); if (!pair.pcs) return FALSE; if (compiland) FIXME("Unsupported yet (filtering on compiland %s)\n", compiland); pair.requested = module_find_by_addr(pair.pcs, base, DMT_UNKNOWN); if (!module_get_debug(&pair)) return FALSE; + if (!compile_regex(&re, srcfile)) return FALSE; sci.SizeOfStruct = sizeof(sci); sci.ModBase = base; @@ -215,6 +260,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, } } } + regfree(&re); return TRUE; }

1 0

Eric Pouech : dbghelp: Fixed offset computation for bitfields inside structures in Codeview debug information .
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: b5ffe31d229b33d12921ec1b95e87e2c8f2297b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ffe31d229b33d12921ec1b9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Sep 6 22:19:46 2008 +0200 dbghelp: Fixed offset computation for bitfields inside structures in Codeview debug information. --- dlls/dbghelp/msc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 04b0224..da6c710 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -525,13 +525,13 @@ static void codeview_add_udt_element(struct codeview_type_parse* ctp, case LF_BITFIELD_V1: symt_add_udt_element(ctp->module, symt, name, codeview_fetch_type(ctp, cv_type->bitfield_v1.type, FALSE), - cv_type->bitfield_v1.bitoff, + (value << 3) + cv_type->bitfield_v1.bitoff, cv_type->bitfield_v1.nbits); return; case LF_BITFIELD_V2: symt_add_udt_element(ctp->module, symt, name, codeview_fetch_type(ctp, cv_type->bitfield_v2.type, FALSE), - cv_type->bitfield_v2.bitoff, + (value << 3) + cv_type->bitfield_v2.bitoff, cv_type->bitfield_v2.nbits); return; }

1 0

Muneyuki Noguchi : notepad: Update Japanese translation.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: fcb488f3f82ee44277c5efa615de3ebe5aab15f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb488f3f82ee44277c5efa61… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Sep 6 17:13:47 2008 +0900 notepad: Update Japanese translation. --- programs/notepad/Ja.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc index eea61fa..3af3007 100644 --- a/programs/notepad/Ja.rc +++ b/programs/notepad/Ja.rc @@ -28,23 +28,23 @@ MAIN_MENU MENU MENUITEM "�V�K�쐬(&N)\tCtrl+N", CMD_NEW MENUITEM "�J��(&O)...\tCtrl+O", CMD_OPEN MENUITEM "�ۑ�(&S)\tCtrl+S", CMD_SAVE - MENUITEM "��O��t��ĕۑ�(&a)...", CMD_SAVE_AS + MENUITEM "��O��t��ĕۑ�(&A)...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "��(&P)...\tCtrl+P", CMD_PRINT - MENUITEM "�y�[�W�ݒ�(&t)...", CMD_PAGE_SETUP - MENUITEM "�v��^�̐ݒ�(&r)...", CMD_PRINTER_SETUP + MENUITEM "�y�[�W�ݒ�(&T)...", CMD_PAGE_SETUP + MENUITEM "�v��^�̐ݒ�(&R)...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "�I��(&x)", CMD_EXIT + MENUITEM "�I��(&X)", CMD_EXIT } POPUP "�ҏW(&E)" { MENUITEM "��ɖ߂�(&U)\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "�؂��(&t)\tCtrl+X", CMD_CUT + MENUITEM "�؂��(&T)\tCtrl+X", CMD_CUT MENUITEM "�R�s�[(&C)\tCtrl+C", CMD_COPY MENUITEM "�\\��t��(&P)\tCtrl+V", CMD_PASTE MENUITEM "�폜(&D)\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "��ׂđI��(&a)\tCtrl+A", CMD_SELECT_ALL + MENUITEM "��ׂđI��(&A)\tCtrl+A", CMD_SELECT_ALL MENUITEM "��t�Ǝ��(&T)\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "��s��܂�Ԃ�(&W)", CMD_WRAP

1 0

Muneyuki Noguchi : appwiz.cpl: Add Japanese resources.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 8f61250bab40c0fdf0db4bb990ddb17c988749fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f61250bab40c0fdf0db4bb99… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Sep 6 18:04:33 2008 +0900 appwiz.cpl: Add Japanese resources. --- dlls/appwiz.cpl/Ja.rc | 79 +++++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 1 + 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Ja.rc b/dlls/appwiz.cpl/Ja.rc new file mode 100644 index 0000000..e17aad8 --- /dev/null +++ b/dlls/appwiz.cpl/Ja.rc @@ -0,0 +1,79 @@ +/* +* Add/Remove Programs Japanese resources +* +* Copyright 2001-2002, 2008 Owen Rudge +* +* 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 +* +*/ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CPL_TITLE, "�v��O��̒ǉ��ƍ폜" + IDS_CPL_DESC, "Allows you to install new software, or remove existing software from your computer." + IDS_TAB1_TITLE, "�A�v��P�[�V��" + + IDS_UNINSTALL_FAILED, "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall entry for this program from the registry?" + IDS_NOT_SPECIFIED, "Not specified" + + IDS_COLUMN_NAME, "��O" + IDS_COLUMN_PUBLISHER, "��s��" + IDS_COLUMN_VERSION, "�o�[�W��" +} + +/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�C��X�g�[��ƃA��C��X�g�[��" +FONT 9, "MS Shell Dlg" +{ + CONTROL "�t��b�s�[ �f�B�X�N�ACD-ROM �h��C�u�܂��̓n�[�h�h��C�u��v��O��C��X�g�[��ɂ́A[�C��X�g�[��] ��N��b�N��Ă��B", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "�C��X�g�[��(&I)...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "�ȉ��̃\\�t�g�E�F�A��I�ɍ폜�ł��܂��B�v��O��폜�܂��̓C��X�g�[��ꂽ�R��|�[�l��g��ύX��ɂ́A��X�g��v��O��I�� [�ǉ��ƍ폜] ��N��b�N��Ă��B", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "�ǉ��ƍ폜(&R)...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "�T�|�[�g��(&S)...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�T�|�[�g��" +FONT 9, "MS Shell Dlg" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "�ȉ��̏�� %s �ɑ΂��Z�p�T�|�[�g�𓾂�̂ɗ��p�ł��܂�:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "��s��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "�o�[�W��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "�A��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "�T�|�[�g��:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "�T�|�[�g�d�b:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Readme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "��i�̍X�V:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "�R��g:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index e0e03b4..21ceb4b 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -27,6 +27,7 @@ #include "En.rc" #include "Fr.rc" +#include "Ja.rc" #include "Nl.rc" #include "No.rc" #include "Ru.rc"

1 0

Michael Stefaniuc : regedit: Fix the Bg, Cs, Da, Es, Hu, It, Ko, Pl, Pt, Ru , Si and Tr translations.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 26f363aed3a73ec2ed6725e1774454580403d063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f363aed3a73ec2ed6725e17… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Sep 6 00:18:31 2008 +0200 regedit: Fix the Bg, Cs, Da, Es, Hu, It, Ko, Pl, Pt, Ru, Si and Tr translations. --- programs/regedit/Bg.rc | 1 + programs/regedit/Cs.rc | 1 + programs/regedit/Da.rc | 1 + programs/regedit/Es.rc | 1 + programs/regedit/Hu.rc | 1 + programs/regedit/It.rc | 1 + programs/regedit/Ko.rc | 1 + programs/regedit/Pl.rc | 1 + programs/regedit/Pt.rc | 2 ++ programs/regedit/Ru.rc | 1 + programs/regedit/Si.rc | 1 + programs/regedit/Tr.rc | 1 + 12 files changed, 13 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Bg.rc b/programs/regedit/Bg.rc index 17bec93..0c86d04 100644 --- a/programs/regedit/Bg.rc +++ b/programs/regedit/Bg.rc @@ -270,6 +270,7 @@ BEGIN IDS_TOO_BIG_VALUE "�� (%ld)" IDS_DELETE_BOX_TITLE "�� " IDS_DELETE_BOX_TEXT "�� '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "�� #%d" IDS_NEWVALUE "�� #%d" IDS_NOTFOUND "Search string '%s' not found" diff --git a/programs/regedit/Cs.rc b/programs/regedit/Cs.rc index dc43f7a..3816e3c 100644 --- a/programs/regedit/Cs.rc +++ b/programs/regedit/Cs.rc @@ -221,6 +221,7 @@ BEGIN IDS_TOO_BIG_VALUE "Hodnota je p��li� velk� (%ld)" IDS_DELETE_BOX_TITLE "Potvr�te smaz�n� polo�ky" IDS_DELETE_BOX_TEXT "Opravdu chcete smazat polo�ku '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "Nov� kl�� #%d" IDS_NEWVALUE "Nov� polo�ka #%d" IDS_NOTFOUND "Search string '%s' not found" diff --git a/programs/regedit/Da.rc b/programs/regedit/Da.rc index 27a517a..8e5eb3a 100644 --- a/programs/regedit/Da.rc +++ b/programs/regedit/Da.rc @@ -292,6 +292,7 @@ BEGIN IDS_TOO_BIG_VALUE "V�rdien er for stor (%ld)" IDS_DELETE_BOX_TITLE "Bekr�ft sletning af v�rdi" IDS_DELETE_BOX_TEXT "Er du sikker p� at ville slette v�rdien '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "Ny n�gle #%d" IDS_NEWVALUE "Ny v�rdi #%d" IDS_NOTFOUND "Fandt ikke s�gestrengen �%s�" diff --git a/programs/regedit/Es.rc b/programs/regedit/Es.rc index bcb5211..2e64e55 100644 --- a/programs/regedit/Es.rc +++ b/programs/regedit/Es.rc @@ -294,6 +294,7 @@ BEGIN IDS_TOO_BIG_VALUE "El valor es demasiado grande (%ld)" IDS_DELETE_BOX_TITLE "Confirmar eliminaci�n de valor" IDS_DELETE_BOX_TEXT "�Seguro que desea eliminar el valor '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "Nueva clave #%d" IDS_NEWVALUE "Nuevo valor #%d" IDS_NOTFOUND "Cadena de b�squeda '%s' no encontrada" diff --git a/programs/regedit/Hu.rc b/programs/regedit/Hu.rc index 948d092..3ef9eae 100644 --- a/programs/regedit/Hu.rc +++ b/programs/regedit/Hu.rc @@ -232,6 +232,7 @@ BEGIN IDS_TOO_BIG_VALUE "Az �rt�k t�l nagy: (%ld)" IDS_DELETE_BOX_TITLE "�rt�kt�rl�s j�v�hagy�sa" IDS_DELETE_BOX_TEXT "Biztos hogy t�r�lni szeretn� a(z) '%s' kulcsot?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "�j kulcs #%d" IDS_NEWVALUE "�j �rt�k #%d" IDS_NOTFOUND "A(z) '%s' keres�si kifejez�s nem tal�lhat�" diff --git a/programs/regedit/It.rc b/programs/regedit/It.rc index 46003af..3c3064b 100644 --- a/programs/regedit/It.rc +++ b/programs/regedit/It.rc @@ -268,6 +268,7 @@ BEGIN IDS_TOO_BIG_VALUE "Valore troppo grande (%ld)" IDS_DELETE_BOX_TITLE "Confermare Cancellazione del Valore" IDS_DELETE_BOX_TEXT "Sei sicuro di voler cancellare il valore '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "Nuova Chiave #%d" IDS_NEWVALUE "Nuovo Valore #%d" IDS_NOTFOUND "Search string '%s' not found" diff --git a/programs/regedit/Ko.rc b/programs/regedit/Ko.rc index 49d633b..fb85d4f 100644 --- a/programs/regedit/Ko.rc +++ b/programs/regedit/Ko.rc @@ -296,6 +296,7 @@ BEGIN IDS_TOO_BIG_VALUE "�� ʹ� Ů�ϴ� (%ld)" IDS_DELETE_BOX_TITLE "�� Ȯ��" IDS_DELETE_BOX_TEXT "�� '%s'�� ڽ��ϱ�?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "�� Ű #%d" IDS_NEWVALUE "�� #%d" IDS_NOTFOUND "'%s'�� ã�� ϴ�" diff --git a/programs/regedit/Pl.rc b/programs/regedit/Pl.rc index 54d1287..eadeca0 100644 --- a/programs/regedit/Pl.rc +++ b/programs/regedit/Pl.rc @@ -292,6 +292,7 @@ BEGIN IDS_TOO_BIG_VALUE "Warto�� jest zbyt du�a (%ld)" IDS_DELETE_BOX_TITLE "Potwierdzenie kasowania" IDS_DELETE_BOX_TEXT "Jeste� pewien, �e chcesz usun�� dan� '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "Nowy klucz #%d" IDS_NEWVALUE "Nowa dana #%d" IDS_NOTFOUND "Nie uda�o si� wyszuka� ci�gu '%s'" diff --git a/programs/regedit/Pt.rc b/programs/regedit/Pt.rc index 9fad3d5..ee2b8ff 100644 --- a/programs/regedit/Pt.rc +++ b/programs/regedit/Pt.rc @@ -359,6 +359,7 @@ BEGIN IDS_TOO_BIG_VALUE "Valor � muito grande (%ld)" IDS_DELETE_BOX_TITLE "Confirmar exclus�o de valor" IDS_DELETE_BOX_TEXT "Tem certeza que deseja excluir o valor '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "Nova chave #%d" IDS_NEWVALUE "Novo valor #%d" IDS_NOTFOUND "Chave de busca '%s' n�o encontrada" @@ -375,6 +376,7 @@ BEGIN IDS_TOO_BIG_VALUE "Valor muito grande (%ld)" IDS_DELETE_BOX_TITLE "Confirmar exclus�o de valor" IDS_DELETE_BOX_TEXT "Tem certeza que deseja excluir o valor '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "Nova chave #%d" IDS_NEWVALUE "Novo valor #%d" IDS_NOTFOUND "Chave de busca '%s' n�o encontrada" diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index 743d8ec..02d5886 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/Ru.rc @@ -292,6 +292,7 @@ BEGIN IDS_TOO_BIG_VALUE "�� (%ld)" IDS_DELETE_BOX_TITLE "��" IDS_DELETE_BOX_TEXT "�� '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "�� #%d" IDS_NEWVALUE "�� #%d" IDS_NOTFOUND "�� '%s' �� " diff --git a/programs/regedit/Si.rc b/programs/regedit/Si.rc index 07c9ec8..52d2e69 100644 --- a/programs/regedit/Si.rc +++ b/programs/regedit/Si.rc @@ -294,6 +294,7 @@ BEGIN IDS_TOO_BIG_VALUE "Vrednost (%ld) je prevelika" IDS_DELETE_BOX_TITLE "Potrditev brisanja vrednosti" IDS_DELETE_BOX_TEXT "Ali ste prepričani, da želite izbrisati vrednost '%s'?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "Nov ključ #%d" IDS_NEWVALUE "Nova vrednost #%d" IDS_NOTFOUND "Iskanega niza '%s' ni mogoče najti" diff --git a/programs/regedit/Tr.rc b/programs/regedit/Tr.rc index 561eb93..f74cfba 100644 --- a/programs/regedit/Tr.rc +++ b/programs/regedit/Tr.rc @@ -267,6 +267,7 @@ BEGIN IDS_TOO_BIG_VALUE "De�er �ok b�y�k (%ld)" IDS_DELETE_BOX_TITLE "De�er silmeyi onayla" IDS_DELETE_BOX_TEXT "'%s' de�erini silmek istedi�inizden emin misiniz?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?" IDS_NEWKEY "Yeni Anahtar #%d" IDS_NEWVALUE "Yeni De�er #%d" IDS_NOTFOUND "Arama dizesi '%s' bulunamad�"

1 0

Michael Stefaniuc : worpad: Fix the German translation.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: ba94f959db3d7b0273eb5e84db41485ddc634285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba94f959db3d7b0273eb5e84d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Sep 6 00:17:55 2008 +0200 worpad: Fix the German translation. --- programs/wordpad/De.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 3572d75..0158084 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -236,6 +236,10 @@ BEGIN "Möchten Sie den Vorgang trotzdem fortsetzen?" STRING_INVALID_NUMBER, "Diese Maßeinheit ist nicht zulässig." STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstützt." + STRING_WRITE_FAILED, "Die Datei konnte nicht gespeichert werden." + STRING_WRITE_ACCESS_DENIED, "Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu speichern." + STRING_OPEN_FAILED, "Die Datei konnte nicht geöffnet werden." + STRING_OPEN_ACCESS_DENIED, "Sie haben keine ausreichende Zugriffsberechtigung um die Datei zu öffnen." END #pragma code_page(default)

1 0

Michael Stefaniuc : wordpad: Change the encoding of the German resource file to utf-8.
by Alexandre Julliard 08 Sep '08

08 Sep '08

Module: wine Branch: master Commit: 5f8ab11751113b9e0b1d4e6bc76ff206dde42b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8ab11751113b9e0b1d4e6bc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Sep 6 00:16:21 2008 +0200 wordpad: Change the encoding of the German resource file to utf-8. --- programs/wordpad/De.rc | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 8c60473..3572d75 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -18,12 +18,14 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +#pragma code_page(65001) + IDM_MAINMENU MENU DISCARDABLE BEGIN POPUP "&Datei" BEGIN MENUITEM "&Neu...\tStrg+N", ID_FILE_NEW - MENUITEM "�&ffnen...\tStrg+O", ID_FILE_OPEN + MENUITEM "Ö&ffnen...\tStrg+O", ID_FILE_OPEN MENUITEM "&Speichern\tStrg+S", ID_FILE_SAVE MENUITEM "Speichern &unter...", ID_FILE_SAVEAS MENUITEM SEPARATOR @@ -35,21 +37,21 @@ BEGIN END POPUP "&Bearbeiten" BEGIN - MENUITEM "&R�ckg�ngig\tStrg+Z", ID_EDIT_UNDO + MENUITEM "&Rückgängig\tStrg+Z", ID_EDIT_UNDO MENUITEM "&Wiederholen\tStrg+Y", ID_EDIT_REDO MENUITEM SEPARATOR MENUITEM "&Ausschneiden\tStrg+X", ID_EDIT_CUT MENUITEM "&Kopieren\tStrg+C", ID_EDIT_COPY - MENUITEM "&Einf�gen\tStrg+V", ID_EDIT_PASTE - MENUITEM "&L�schen\tEntf", ID_EDIT_CLEAR + MENUITEM "&Einfügen\tStrg+V", ID_EDIT_PASTE + MENUITEM "&Löschen\tEntf", ID_EDIT_CLEAR MENUITEM "Alles &markieren\tStrg+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "&Suchen...\tStrg+F", ID_FIND MENUITEM "&Weitersuchen\tF3", ID_FIND_NEXT MENUITEM "Erset&zen...\tStrg+H", ID_REPLACE MENUITEM SEPARATOR - MENUITEM "Schreibgesch�&tzt", ID_EDIT_READONLY - MENUITEM "&Ge�ndert", ID_EDIT_MODIFIED + MENUITEM "Schreibgeschü&tzt", ID_EDIT_READONLY + MENUITEM "&Geändert", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "&Extras" BEGIN @@ -69,14 +71,14 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Optionen...", ID_VIEWPROPERTIES END - POPUP "&Einf�gen" + POPUP "&Einfügen" BEGIN MENUITEM "&Datum und Uhrzeit...", ID_DATETIME END POPUP "Forma&t" BEGIN MENUITEM "Sch&riftart...", ID_FONTSETTINGS - MENUITEM "Auf&z�hlungszeichen" ID_BULLET + MENUITEM "Auf&zählungszeichen" ID_BULLET MENUITEM "&Absatz..." ID_PARAFORMAT MENUITEM "&Tabstopps..." ID_TABSTOPS POPUP "&Hintergrund" @@ -87,7 +89,7 @@ BEGIN END POPUP "&?" BEGIN - MENUITEM "�&ber Wine Wordpad" ID_ABOUT + MENUITEM "Ü&ber Wine Wordpad" ID_ABOUT END END @@ -97,9 +99,9 @@ BEGIN BEGIN MENUITEM "Aus&schneiden", ID_EDIT_CUT MENUITEM "&Kopieren", ID_EDIT_COPY - MENUITEM "&Einf�gen", ID_EDIT_PASTE + MENUITEM "&Einfügen", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Auf&z�hlungszeichen" ID_BULLET + MENUITEM "Auf&zählungszeichen" ID_BULLET MENUITEM "&Absatz..." ID_PARAFORMAT END END @@ -109,7 +111,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Datum und Uhrzeit" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Verf�gbare Formate",0,3,2,100,15 + LTEXT "Verfügbare Formate",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "A&bbrechen",IDCANCEL,87,26,40,12 @@ -152,10 +154,10 @@ BEGIN GROUPBOX "Tabstoppposition", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT DEFPUSHBUTTON "&Festlegen", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "&L�schen", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&Löschen", ID_TAB_DEL, 72, 80, 45, 15 PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 - PUSHBUTTON "&Alle l�schen", ID_TAB_EMPTY, 137, 51, 50, 15 + PUSHBUTTON "&Alle löschen", ID_TAB_EMPTY, 137, 51, 50, 15 END IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 @@ -211,11 +213,11 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_PREVIEW_PRINT, "&Drucken" - STRING_PREVIEW_NEXTPAGE, "&N�chste" + STRING_PREVIEW_NEXTPAGE, "&Nächste" STRING_PREVIEW_PREVPAGE, "&Vorherige" STRING_PREVIEW_TWOPAGES, "Zwei Seiten" STRING_PREVIEW_ONEPAGE, "Eine Seite" - STRING_PREVIEW_CLOSE, "&Schlie�en" + STRING_PREVIEW_CLOSE, "&Schließen" END STRINGTABLE DISCARDABLE @@ -226,12 +228,14 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" - STRING_PROMPT_SAVE_CHANGES, "�nderungen an '%s' speichern?" + STRING_PROMPT_SAVE_CHANGES, "Änderungen an '%s' speichern?" STRING_SEARCH_FINISHED, "Wordpad hat das Durchsuchen des Dokuments beendet." STRING_LOAD_RICHED_FAILED, "Die RichEdit-Bibliothek konnte nicht geladen werden." STRING_SAVE_LOSEFORMATTING, "Sie sind dabei, die Datei als Textdatei zu speichern. " \ "Dadurch geht die Formatierung verloren. " \ - "M�chten Sie den Vorgang trotzdem fortsetzen?" - STRING_INVALID_NUMBER, "Diese Ma�einheit ist nicht zul�ssig." - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterst�tzt." + "Möchten Sie den Vorgang trotzdem fortsetzen?" + STRING_INVALID_NUMBER, "Diese Maßeinheit ist nicht zulässig." + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE-Dokumentenspeicherung wird nicht unterstützt." END + +#pragma code_page(default)

1 0