February 2012 - Wine-commits

Eric Pouech : dbghelp: Correctly initialize module word_size field when only the eh_frame is present (and not compilation unit).
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 611d5e470d79577f6c2c6f255a12b289b03b7d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=611d5e470d79577f6c2c6f255… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Feb 13 21:41:39 2012 +0100 dbghelp: Correctly initialize module word_size field when only the eh_frame is present (and not compilation unit). --- dlls/dbghelp/dwarf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2a16650..6e57346 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3366,6 +3366,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_modfmt->module->module.SourceIndexed = TRUE; dwarf2_modfmt->module->module.Publics = TRUE; + /* set the word_size for eh_frame parsing */ + dwarf2_modfmt->u.dwarf2_info->word_size = fmap->addr_size / 8; + leave: image_unmap_section(&debug_sect); image_unmap_section(&debug_abbrev_sect);

1 0

Eric Pouech : dbghelp: In dwarf parser, when looking for FDE/ CIE skip first O-length entries.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 5201415626dba596236f4aa5404de9d1787b0fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5201415626dba596236f4aa54… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Feb 13 21:41:45 2012 +0100 dbghelp: In dwarf parser, when looking for FDE/CIE skip first O-length entries. --- dlls/dbghelp/dwarf.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 6e57346..9335db7c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2632,6 +2632,15 @@ static BOOL dwarf2_get_cie(unsigned long addr, struct module* module, DWORD_PTR const BYTE* start_data = fde_ctx->data; cie_id = in_eh_frame ? 0 : DW_CIE_ID; + /* skip 0-padding at beginning of section (alignment) */ + while (fde_ctx->data + 2 * 4 < fde_ctx->end_data) + { + if (dwarf2_parse_u4(fde_ctx)) + { + fde_ctx->data -= 4; + break; + } + } for (; fde_ctx->data + 2 * 4 < fde_ctx->end_data; fde_ctx->data = ptr_blk) { /* find the FDE for address addr (skip CIE) */ @@ -2659,7 +2668,9 @@ static BOOL dwarf2_get_cie(unsigned long addr, struct module* module, DWORD_PTR cie_ctx->end_data = cie_ptr + 4 + dwarf2_parse_u4(cie_ctx); if (dwarf2_parse_u4(cie_ctx) != cie_id) { - FIXME("wrong CIE pointer\n"); + FIXME("wrong CIE pointer at %x from FDE %x\n", + (unsigned)(cie_ptr - start_data), + (unsigned)(fde_ctx->data - start_data)); return FALSE; } if (!parse_cie_details(cie_ctx, info)) return FALSE;

1 0

Eric Pouech : dbghelp: In traces for Dwarf/CFA engine, some offset are signed entities.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 0905afd0bc8dfa5cca2270c28a60b6d2dd97248a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0905afd0bc8dfa5cca2270c28… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Feb 13 21:41:54 2012 +0100 dbghelp: In traces for Dwarf/CFA engine, some offset are signed entities. --- dlls/dbghelp/dwarf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 9335db7c..3f3d6df 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2851,7 +2851,7 @@ static void execute_cfa_instructions(dwarf2_traverse_context_t* ctx, ULONG_PTR offset = (op == DW_CFA_def_cfa) ? dwarf2_leb128_as_unsigned(ctx) : dwarf2_leb128_as_signed(ctx) * info->data_align; if (!valid_reg(reg)) break; - TRACE("%lx: DW_CFA_def_cfa %s, %lu\n", + TRACE("%lx: DW_CFA_def_cfa %s, %ld\n", info->ip, dbghelp_current_cpu->fetch_regname(dbghelp_current_cpu->map_dwarf_register(reg)), offset); @@ -2876,7 +2876,7 @@ static void execute_cfa_instructions(dwarf2_traverse_context_t* ctx, { ULONG_PTR offset = (op == DW_CFA_def_cfa_offset) ? dwarf2_leb128_as_unsigned(ctx) : dwarf2_leb128_as_signed(ctx) * info->data_align; - TRACE("%lx: DW_CFA_def_cfa_offset %lu\n", info->ip, offset); + TRACE("%lx: DW_CFA_def_cfa_offset %ld\n", info->ip, offset); info->state.cfa_offset = offset; info->state.cfa_rule = RULE_CFA_OFFSET; break;

1 0

Eric Pouech : dbghelp: In i386 stack unwinder, only check for NULL ebp after calling the dwarf/ MSVC unwinders as they allow NULL ebp.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 90207b1d6966d09ea5ed34dc1d6141fd7f4292cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=90207b1d6966d09ea5ed34dc1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Feb 13 21:42:04 2012 +0100 dbghelp: In i386 stack unwinder, only check for NULL ebp after calling the dwarf/MSVC unwinders as they allow NULL ebp. --- dlls/dbghelp/cpu_i386.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 3a66def..d15afdd 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -115,6 +115,7 @@ static BOOL fetch_next_frame32(struct cpu_stack_walk* csw, /* do a simple unwind using ebp * we assume a "regular" prologue in the function has been used */ + if (!context->Ebp) return FALSE; context->Esp = context->Ebp + 2 * sizeof(DWORD); if (!sw_read_mem(csw, context->Ebp + sizeof(DWORD), &val32, sizeof(DWORD))) { @@ -273,7 +274,6 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO } else { - if (frame->AddrFrame.Offset == 0) goto done_err; if (frame->AddrFrame.Mode == AddrModeFlat) { assert(curr_mode == stm_32bit); @@ -389,7 +389,8 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO frame->AddrPC = frame->AddrReturn; frame->AddrStack.Offset = frame->AddrFrame.Offset + 2 * sizeof(WORD); /* "pop up" previous BP value */ - if (!sw_read_mem(csw, sw_xlat_addr(csw, &frame->AddrFrame), + if (!frame->AddrFrame.Offset || + !sw_read_mem(csw, sw_xlat_addr(csw, &frame->AddrFrame), &val16, sizeof(WORD))) goto done_err; frame->AddrFrame.Offset = val16;

1 0

Eric Pouech : dbghelp: Fix a couple of traces in dwarf line info parsing.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 43f62c99b95163d57bfd3b8927491f30713bc78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f62c99b95163d57bfd3b892… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Feb 13 21:42:10 2012 +0100 dbghelp: Fix a couple of traces in dwarf line info parsing. --- dlls/dbghelp/dwarf.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 3f3d6df..a7a7001 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2270,15 +2270,19 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, address = ctx->load_offset + dwarf2_parse_addr(&traverse); break; case DW_LNE_define_file: - FIXME("not handled %s\n", traverse.data); + FIXME("not handled define file %s\n", traverse.data); traverse.data += strlen((const char *)traverse.data) + 1; dwarf2_leb128_as_unsigned(&traverse); dwarf2_leb128_as_unsigned(&traverse); dwarf2_leb128_as_unsigned(&traverse); break; case DW_LNE_set_discriminator: - WARN("not handled %s\n", traverse.data); - dwarf2_leb128_as_unsigned(&traverse); + { + unsigned descr; + + descr = dwarf2_leb128_as_unsigned(&traverse); + WARN("not handled discriminator %x\n", descr); + } break; default: FIXME("Unsupported extended opcode %x\n", extopcode);

1 0

Francois Gouget : po: Remove invalid Close/Next translation suggestions.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 969a6994f35744016c3eb340d495a9eb4353ed7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=969a6994f35744016c3eb340d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 14 09:10:47 2012 +0100 po: Remove invalid Close/Next translation suggestions. --- po/ar.po | 9 +++------ po/bg.po | 3 +-- po/cs.po | 3 +-- po/da.po | 3 +-- po/eo.po | 3 +-- po/es.po | 3 +-- po/fa.po | 9 +++------ po/he.po | 3 +-- po/hu.po | 5 ----- po/nb_NO.po | 3 +-- po/pt_PT.po | 3 +-- po/sr_RS(a)cyrillic.po | 3 +-- po/sr_RS(a)latin.po | 3 +-- po/sv.po | 3 +-- po/th.po | 9 +++------ po/tr.po | 5 ----- po/wa.po | 3 +-- po/zh_CN.po | 3 +-- po/zh_TW.po | 3 +-- 19 files changed, 23 insertions(+), 56 deletions(-) diff --git a/po/ar.po b/po/ar.po index e24785d..5c39a4f 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8180,9 +8180,8 @@ msgid "Ma&ximize" msgstr "" #: user32.rc:33 -#, fuzzy msgid "&Close\tAlt+F4" -msgstr "ا&نسخ\tCtrl+C" +msgstr "" #: user32.rc:35 #, fuzzy @@ -8190,14 +8189,12 @@ msgid "&About Wine" msgstr "&عن لوح الملاحظات" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl+F4" -msgstr "ا&نسخ\tCtrl+C" +msgstr "" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "&قص\tCtrl+X" +msgstr "" #: user32.rc:79 #, fuzzy diff --git a/po/bg.po b/po/bg.po index 05d4352..5e16279 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8324,9 +8324,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Затвори\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "&Изрежи\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/cs.po b/po/cs.po index dd212fb..c8a2ea5 100644 --- a/po/cs.po +++ b/po/cs.po @@ -8420,9 +8420,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Zavři\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "Vyjmou&t\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/da.po b/po/da.po index 6700606..bda6e66 100644 --- a/po/da.po +++ b/po/da.po @@ -8455,9 +8455,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Luk\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "&Klip\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/eo.po b/po/eo.po index 2a2fe73..7fda90c 100644 --- a/po/eo.po +++ b/po/eo.po @@ -8340,9 +8340,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Fermu\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "Tondu\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/es.po b/po/es.po index 7e9e970..e3ee6c1 100644 --- a/po/es.po +++ b/po/es.po @@ -8615,9 +8615,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Cerrar\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "Cor&tar\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/fa.po b/po/fa.po index 58a93e9..09dd65b 100644 --- a/po/fa.po +++ b/po/fa.po @@ -8180,9 +8180,8 @@ msgid "Ma&ximize" msgstr "" #: user32.rc:33 -#, fuzzy msgid "&Close\tAlt+F4" -msgstr "&نسخه‌برداری\tCtrl+C" +msgstr "" #: user32.rc:35 #, fuzzy @@ -8190,14 +8189,12 @@ msgid "&About Wine" msgstr "&درباره نت‌پد" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl+F4" -msgstr "&نسخه‌برداری\tCtrl+C" +msgstr "" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "&برش\tCtrl+X" +msgstr "" #: user32.rc:79 #, fuzzy diff --git a/po/he.po b/po/he.po index e1bf2af..2926018 100644 --- a/po/he.po +++ b/po/he.po @@ -8472,9 +8472,8 @@ msgid "&Close\tCtrl+F4" msgstr "&סגירה\tCtrl-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "ג&זירה\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/hu.po b/po/hu.po index 46b4148..af834bd 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8636,13 +8636,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Bezárás\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" msgstr "" -"#-#-#-#-# hu.po (Wine) #-#-#-#-#\n" -"Kivá&gás\tCtrl+X\n" -"#-#-#-#-# hu.po (Wine) #-#-#-#-#\n" -"Kiv&ágás\tCtrl+X" #: user32.rc:79 msgid "&Abort" diff --git a/po/nb_NO.po b/po/nb_NO.po index 4bbb5bf..22fdaf2 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8512,9 +8512,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Lukk\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "Klipp u&t\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/pt_PT.po b/po/pt_PT.po index f7c9495..1441248 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8528,9 +8528,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Fechar\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "&Cortar\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/sr_RS(a)cyrillic.po b/po/sr_RS(a)cyrillic.po index e207b78..7dc2043 100644 --- a/po/sr_RS(a)cyrillic.po +++ b/po/sr_RS(a)cyrillic.po @@ -8508,9 +8508,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Затвори\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "&Исеци\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/sr_RS(a)latin.po b/po/sr_RS(a)latin.po index b0ca0b5..7cdb952 100644 --- a/po/sr_RS(a)latin.po +++ b/po/sr_RS(a)latin.po @@ -8608,9 +8608,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Zatvori\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "&Iseci\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/sv.po b/po/sv.po index 9f39481..83e95af 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8255,9 +8255,8 @@ msgid "&Close\tCtrl+F4" msgstr "A&vsluta\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "Klipp &ut\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/th.po b/po/th.po index d9a3091..64b2ac0 100644 --- a/po/th.po +++ b/po/th.po @@ -8193,23 +8193,20 @@ msgid "Ma&ximize" msgstr "" #: user32.rc:33 -#, fuzzy msgid "&Close\tAlt+F4" -msgstr "ตัดลอก\tCtrl+C" +msgstr "" #: user32.rc:35 msgid "&About Wine" msgstr "" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl+F4" -msgstr "ตัดลอก\tCtrl+C" +msgstr "" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "ตัด\tCtrl+X" +msgstr "" #: user32.rc:79 #, fuzzy diff --git a/po/tr.po b/po/tr.po index 3111905..e6e9661 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8525,13 +8525,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Kapat\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" msgstr "" -"#-#-#-#-# tr.po (Wine) #-#-#-#-#\n" -"&Kes\tCtrl+X\n" -"#-#-#-#-# tr.po (Wine) #-#-#-#-#\n" -"Ke&s\tCtrl+X" #: user32.rc:79 msgid "&Abort" diff --git a/po/wa.po b/po/wa.po index 5b83e7b..57c5791 100644 --- a/po/wa.po +++ b/po/wa.po @@ -8154,9 +8154,8 @@ msgid "&Close\tCtrl+F4" msgstr "&Cloyu\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "Cô&per\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/zh_CN.po b/po/zh_CN.po index 2d0b281..e98c75e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8447,9 +8447,8 @@ msgid "&Close\tCtrl+F4" msgstr "关闭(&N)\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "剪切(&T)\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort" diff --git a/po/zh_TW.po b/po/zh_TW.po index c22c605..533f8bf 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8501,9 +8501,8 @@ msgid "&Close\tCtrl+F4" msgstr "關閉(&N)\tAlt-F4" #: user32.rc:48 -#, fuzzy msgid "Nex&t\tCtrl+F6" -msgstr "剪下(&T)\tCtrl+X" +msgstr "" #: user32.rc:79 msgid "&Abort"

1 0

Francois Gouget : po: Tweak some Catalan translations.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 1b8f1c52e20c57a77da05c1e0c377a9a8fe70113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8f1c52e20c57a77da05c1e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 14 09:07:40 2012 +0100 po: Tweak some Catalan translations. --- po/ca.po | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/po/ca.po b/po/ca.po index fc8a2e1..d647f5a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9371,7 +9371,7 @@ msgid "" "The requirement to double the % sign when using FOR in a batch file does\n" "not exist in wine's cmd.\n" msgstr "" -"L'ordre FOR s'usa per executar un ordre per cada un d'un conjunt de\n" +"L'ordre FOR s'usa per executar un ordre per cada un d'un conjunt de " "fitxers.\n" "\n" "Sintaxi: FOR %variable IN (conjunt) DO ordre\n" @@ -9465,7 +9465,7 @@ msgid "" "\n" "MOVE fails if the old and new locations are on different DOS drive letters.\n" msgstr "" -"MOVE trasllada un fitxer o directori a un nou punt dins el sistema de\n" +"MOVE trasllada un fitxer o directori a un nou punt dins el sistema de " "fitxers.\n" "\n" "Si l'article que es mou és un directori, després tots els fitxers i\n" @@ -9503,7 +9503,7 @@ msgid "" "It is mainly useful in batch files to allow the user to read the output\n" "of a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE mostra un missatge en la pantalla demanant que l'usuari premi una\n" +"PAUSE mostra un missatge en la pantalla demanant que l'usuari premi una " "tecla.\n" "\n" "És principalment útil en els fitxers batch per permetre que l'usuari\n" @@ -9537,7 +9537,7 @@ msgstr "" "La cadena que segueix l'ordre PROMPT (i l'espai immediatament després)\n" "apareix al principi de la línia quan cmd està esperant l'entrada.\n" "\n" -"Les cadenes de caràcters següents tenen el significat especial que\n" +"Les cadenes de caràcters següents tenen el significat especial que " "s'indica:\n" "\n" "$$ Signe de dòlar $_ Nova línia $b Barra vertical " @@ -10098,8 +10098,7 @@ msgstr "Ús: ipconfig [ /? | /all ]\n" #: ipconfig.rc:28 msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "" -"Error: Paràmetres de línia d'ordres desconeguts o invàlids\n" -"especificats\n" +"Error: Paràmetres de línia d'ordres desconeguts o invàlids especificats\n" #: ipconfig.rc:29 msgid "%1 adapter %2\n" @@ -13565,17 +13564,17 @@ msgstr "%1 de %2 lliure" #: winefile.rc:117 msgctxt "unit kilobyte" msgid "kB" -msgstr "" +msgstr "kB" #: winefile.rc:118 msgctxt "unit megabyte" msgid "MB" -msgstr "" +msgstr "MB" #: winefile.rc:119 msgctxt "unit gigabyte" msgid "GB" -msgstr "" +msgstr "GB" #: winemine.rc:34 msgid "&Game"

1 0

Francois Gouget : po: Tweak / fix some French translations.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: bc80d174d0fc2d4ff0a853d55bb0c11179d0dfc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc80d174d0fc2d4ff0a853d55… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 14 09:13:08 2012 +0100 po: Tweak / fix some French translations. --- po/fr.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5a550b2..e5cf00e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7914,7 +7914,7 @@ msgstr "Historique" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "Programmes" #: shell32.rc:214 msgid "My Pictures" @@ -7946,7 +7946,7 @@ msgstr "Vidéos" #: shell32.rc:213 msgid "Program Files (x86)" -msgstr "Program Files (x86)" +msgstr "Programmes (x86)" #: shell32.rc:221 msgid "Contacts" @@ -7978,19 +7978,19 @@ msgstr "Modèle" #: shell32.rc:225 msgid "Sample Music" -msgstr "Exemples de musiques" +msgstr "Échantillons de musique" #: shell32.rc:226 msgid "Sample Pictures" -msgstr "Exemples d'images" +msgstr "Échantillons d'images" #: shell32.rc:227 msgid "Sample Playlists" -msgstr "Exemples de listes de lecture" +msgstr "Échantillons de listes de lecture" #: shell32.rc:228 msgid "Sample Videos" -msgstr "Exemples de vidéos" +msgstr "Échantillons de vidéos" #: shell32.rc:229 msgid "Saved Games" @@ -8176,7 +8176,7 @@ msgstr "" "Publique Limitée pour plus de détails.\n" "\n" "Vous devriez avoir reçu une copie de la Licence Générale Publique Limitée " -"GNU avec Wine ; si ce n’est pas le cas, écrivez à la Free Software " +"GNU avec Wine ; si ce n’est pas le cas, écrivez à la Free Software " "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:253 @@ -9403,10 +9403,10 @@ msgid "" "The requirement to double the % sign when using FOR in a batch file does\n" "not exist in wine's cmd.\n" msgstr "" -"La commande FOR sert à exécuter une commande pour chaque fichier d'un groupe " +"La commande FOR sert à exécuter une commande pour chaque fichier d'une liste " "de fichiers.\n" "\n" -"Syntaxe : FOR %variable IN (groupe) DO commande\n" +"Syntaxe : FOR %variable IN (liste) DO commande\n" "\n" "La nécessité de doubler le signe « % » lorsque l'on utilise FOR dans un " "fichier batch\n"

1 0

Francois Gouget : po: Update the Hebrew command line 'translations'.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 1a2fc189762dc1eaa47aae568c78cf0fa7bd1831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2fc189762dc1eaa47aae568… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 14 09:08:22 2012 +0100 po: Update the Hebrew command line 'translations'. --- po/he.po | 54 ++++++++++++++++-------------------------------------- 1 files changed, 16 insertions(+), 38 deletions(-) diff --git a/po/he.po b/po/he.po index 2926018..6fcd4d8 100644 --- a/po/he.po +++ b/po/he.po @@ -9636,12 +9636,11 @@ msgstr "" "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" #: cmd.rc:153 -#, fuzzy msgid "" "A command line beginning with REM (followed by a space) performs no\n" "action, and can therefore be used as a comment in a batch file.\n" msgstr "" -"A command line beginning REM (followed by a space) performs no\n" +"A command line beginning with REM (followed by a space) performs no\n" "action, and can therefore be used as a comment in a batch file.\n" #: cmd.rc:156 @@ -9661,7 +9660,6 @@ msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "RMDIR <dir> deletes a subdirectory.\n" #: cmd.rc:194 -#, fuzzy msgid "" "SET displays or changes the cmd environment variables.\n" "\n" @@ -9689,7 +9687,7 @@ msgstr "" "SET <variable>=<value>\n" "\n" "where <variable> and <value> are character strings. There must be no\n" -"spaces before the equals sign, nor can the variable name\n" +"space before the equals sign, nor can the variable name\n" "have embedded spaces.\n" "\n" "Under Wine, the environment of the underlying operating system is\n" @@ -9708,7 +9706,6 @@ msgstr "" "if called from the command line.\n" #: cmd.rc:176 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9743,20 +9740,14 @@ msgstr "" "/ProgIDOpen Open a document using the following progID.\n" "/L Show end-user license.\n" "/? Display this help and exit.\n" -"\n" -"start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start comes with ABSOLUTELY NO WARRANTY; for details run with /L option.\n" -"This is free software, and you are welcome to redistribute it\n" -"under certain conditions; run 'start /L' for details.\n" #: cmd.rc:201 msgid "TIME sets or shows the current system time.\n" msgstr "TIME sets or shows the current system time.\n" #: cmd.rc:203 -#, fuzzy msgid "TITLE <string> sets the window title for the cmd window.\n" -msgstr "Sets the window title for the cmd window, syntax TITLE [string]\n" +msgstr "TITLE <string> sets the window title for the cmd window.\n" #: cmd.rc:207 msgid "" @@ -9767,7 +9758,6 @@ msgstr "" "if redirected). No check is made that the file is readable text.\n" #: cmd.rc:216 -#, fuzzy msgid "" "VERIFY is used to set, clear or test the verify flag. Valid forms are:\n" "\n" @@ -9779,8 +9769,8 @@ msgid "" msgstr "" "VERIFY is used to set, clear or test the verify flag. Valid forms are:\n" "\n" -"VERIFY ON\tSet the flag\n" -"VERIFY OFF\tClear the flag\n" +"VERIFY ON\tSet the flag.\n" +"VERIFY OFF\tClear the flag.\n" "VERIFY\t\tDisplays ON or OFF as appropriate.\n" "\n" "The verify flag has no function in Wine.\n" @@ -9826,11 +9816,8 @@ msgstr "" "stack, and then changes the current directory to the supplied one.\n" #: cmd.rc:238 -#, fuzzy msgid "POPD changes current directory to the last one saved with PUSHD.\n" -msgstr "" -"POPD changes current directory to the last one saved with\n" -"PUSHD.\n" +msgstr "POPD changes current directory to the last one saved with PUSHD.\n" #: cmd.rc:246 msgid "" @@ -9881,7 +9868,6 @@ msgstr "" "to the operating system or shell from which you invoked cmd.\n" #: cmd.rc:305 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -9950,6 +9936,7 @@ msgstr "" "RD (RMDIR)\tDelete a subdirectory\n" "SET\t\tSet or show environment variables\n" "SETLOCAL\tStart localization of environment changes in a batch file\n" +"START\t\tStart a program, or open a document in the associated program\n" "TIME\t\tSet or show the current system time\n" "TITLE\t\tSet the window title for the CMD session\n" "TYPE\t\tType the contents of a text file\n" @@ -9961,9 +9948,8 @@ msgstr "" "Enter HELP <command> for further information on any of the above commands.\n" #: cmd.rc:307 -#, fuzzy msgid "Are you sure?" -msgstr "Are you sure" +msgstr "Are you sure?" #: cmd.rc:308 xcopy.rc:40 msgctxt "Yes key" @@ -9984,9 +9970,8 @@ msgid "No open command associated with file type '%1'\n" msgstr "No open command associated with file type '%1'\n" #: cmd.rc:312 -#, fuzzy msgid "Overwrite %1?" -msgstr "Overwrite %1" +msgstr "Overwrite %1?" #: cmd.rc:313 msgid "More..." @@ -10046,9 +10031,8 @@ msgid "A" msgstr "A" #: cmd.rc:329 -#, fuzzy msgid "Delete %1?" -msgstr "מחיקה" +msgstr "Delete %1?" #: cmd.rc:330 msgid "Echo is %1\n" @@ -10075,9 +10059,8 @@ msgstr "" "\n" #: cmd.rc:335 -#, fuzzy msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "Volume label (11 characters, ENTER for none)?" +msgstr "Volume label (11 characters, <Enter> for none)?" #: cmd.rc:336 msgid "PATH not found\n" @@ -10112,14 +10095,12 @@ msgid "Volume in drive %1!c! has no label.\n" msgstr "" #: cmd.rc:344 -#, fuzzy msgid " (Yes|No)" -msgstr "%1? (Yes|No)\n" +msgstr " (Yes|No)" #: cmd.rc:345 -#, fuzzy msgid " (Yes|No|All)" -msgstr "%1? (Yes|No)\n" +msgstr " (Yes|No|All)" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -11581,7 +11562,6 @@ msgstr "" "under certain conditions; run 'start /L' for details.\n" #: start.rc:64 -#, fuzzy msgid "" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "This program is free software; you can redistribute it and/or\n" @@ -11608,7 +11588,7 @@ msgstr "" "\n" "This program is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" "GNU Lesser Public License for more details.\n" "\n" "You should have received a copy of the GNU Lesser Public License\n" @@ -14286,14 +14266,12 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "Invalid number of parameters - Use xcopy /? for help\n" #: xcopy.rc:28 -#, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "Invalid parameter '%1' - Use xcopy /? for help\n" +msgstr "Invalid parameter '%1' - Use xcopy /? for help\n" #: xcopy.rc:29 -#, fuzzy msgid "Press <Enter> to begin copying\n" -msgstr "Press <enter> to begin copying\n" +msgstr "Press <Enter> to begin copying\n" #: xcopy.rc:30 msgid "%1!d! file(s) would be copied\n"

1 0

Francois Gouget : po: Fix some typography issues in the Hebrew translation.
by Alexandre Julliard 14 Feb '12

14 Feb '12

Module: wine Branch: master Commit: 1e5c2a56900f0d6b235fa91f60b49c95d437be2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5c2a56900f0d6b235fa91f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 14 10:01:42 2012 +0100 po: Fix some typography issues in the Hebrew translation. --- po/he.po | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/po/he.po b/po/he.po index 6fcd4d8..46840a5 100644 --- a/po/he.po +++ b/po/he.po @@ -2424,15 +2424,15 @@ msgstr "" #: cryptui.rc:35 msgid "Issued to: " -msgstr "הונפק עבור:" +msgstr "הונפק עבור: " #: cryptui.rc:36 msgid "Issued by: " -msgstr "הונפק על ידי:" +msgstr "הונפק על ידי: " #: cryptui.rc:37 msgid "Valid from " -msgstr "תקף מהתאריך" +msgstr "תקף מהתאריך " #: cryptui.rc:38 msgid " to " @@ -2609,7 +2609,7 @@ msgstr "" #: cryptui.rc:83 msgid "Could not open " -msgstr "לא ניתן לפתוח" +msgstr "לא ניתן לפתוח " #: cryptui.rc:84 msgid "Determined by the program" @@ -3217,7 +3217,7 @@ msgstr "&מועדפים" #: ieframe.rc:52 regedit.rc:73 msgid "&Add to Favorites..." -msgstr "הו&ספה למועדפים…" +msgstr "הו&ספה למועדפים..." #: ieframe.rc:57 #, fuzzy @@ -3373,7 +3373,7 @@ msgstr "הגדרת דפדפן האינטרנט של Wine והגדרות שקשו #: inetcpl.rc:30 msgid "Security settings for zone: " -msgstr "הגדרות אבטחה עבור האזור" +msgstr "הגדרות אבטחה עבור האזור: " #: inetcpl.rc:31 msgid "Custom" @@ -6991,7 +6991,7 @@ msgstr "ה&גדרה..." #: msvfw32.rc:40 msgid "&About" -msgstr "על &אודות..." +msgstr "על &אודות" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -7530,7 +7530,7 @@ msgid "" "make sure the correct drive is selected below" msgstr "" "נא להכניס את תקליטור ההתקנה של היצרן ואז לוודא\n" -"שהכונן שנבחר להלן הוא הכונן הנכון." +"שהכונן שנבחר להלן הוא הכונן הנכון" #: setupapi.rc:54 msgid "Copy manufacturer's files from:" @@ -8004,7 +8004,7 @@ msgstr "&פתיחה:" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:132 msgid "&Browse..." -msgstr "&עיון" +msgstr "&עיון..." #: shell32.rc:135 shell32.rc:139 winefile.rc:107 msgid "Size" @@ -8389,7 +8389,7 @@ msgstr "" "הפחות כללי של GNU כפי שפורסם על ידי מוסד התכנה החופשית; או גרסה 2.1 של " "הרישיון או (לבחירתך) כל גרסה עדכנית יותר.\n" "\n" -" Wine מופצת בתקווה שתביא תועלת, אך ללא כל אחריות; אפילו לא מרומזת למטרות, ‎" +"Wine מופצת בתקווה שתביא תועלת, אך ללא כל אחריות; אפילו לא מרומזת למטרות, ‎" "מסחר או התאמה לצרכים מסוימים. נא לעיין בתנאי הרישיון הציבורי הפחות כללי של " "GNU לפרטים נוספים.\n" "\n" @@ -11068,11 +11068,11 @@ msgstr "מידע" #: progman.rc:65 msgid "Delete group `%s'?" -msgstr "האם למחוק את הקבוצה `%s' ?" +msgstr "האם למחוק את הקבוצה `%s'?" #: progman.rc:66 msgid "Delete program `%s'?" -msgstr "האם למחוק את התכנית `%s' ?" +msgstr "האם למחוק את התכנית `%s'?" #: progman.rc:67 msgid "Not implemented" @@ -12479,7 +12479,7 @@ msgid "" "Do you want to remove the uninstall entry from the registry?" msgstr "" "הפעלת פקודת ההסרה '%s' נכשלה, כנראה עקב חוסר בקובץ הפעלה.\n" -"האם ברצונך להסיר את רשומת ההסרה מרישומי המערכת ?" +"האם ברצונך להסיר את רשומת ההסרה מרישומי המערכת?" #: view.rc:33 msgid "&Pan" @@ -13836,8 +13836,9 @@ msgid "Always on &top" msgstr "תמיד &עליון" #: winhlp32.rc:56 +#, fuzzy msgid "&About Wine Help" -msgstr "&מידע..." +msgstr "&מידע" #: winhlp32.rc:64 msgid "Annotation..."

1 0