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

Michael Stefaniuc : Update the mailing lists traffic stats.
by Jeremy Newman June 9, 2010

June 9, 2010

Module: website Branch: master Commit: a5b773a734e2911315e23fb52cf5cee74837fbd7 URL: http://source.winehq.org/git/website.git/?a=commit;h=a5b773a734e2911315e23f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 10 00:00:07 2010 +0200 Update the mailing lists traffic stats. Traffic stats gathered from the archives for the last 12 months. The wine-bugs number was waay off. --- templates/en/forums.template | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index f8a04a0..e427d50 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -57,7 +57,7 @@ mailing list software. [<a href="news://news.gmane.org/gmane.comp.emulators.wine.user">via newsreader</a>] [<a href="http://forum.winehq.org">via web forums</a>] <a href="mailto:wine-users(a)winehq.org">wine-users(a)winehq.org</a> - A high traffic (50/day) open list for end-user discussions. + A medium traffic (50/day) open list for end-user discussions. <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-devel">(Un-)Subscribe</a>] @@ -74,7 +74,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - A medium traffic (30/day) open list for submitting patches only. + A medium traffic (45/day) open list for submitting patches only. <li> [<a href="http://www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] @@ -82,7 +82,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.cvs">via newsreader</a>] <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> - A medium traffic (25/day) read only list which tracks commits to the Git + A medium traffic (35/day) read only list which tracks commits to the Git tree. <li> @@ -105,7 +105,7 @@ mailing list software. [<a href="http://news.gmane.org/gmane.comp.emulators.wine.bugs">Archive 2</a>] [<a href="news://news.gmane.org/gmane.comp.emulators.wine.bugs">via newsreader</a>] <a href="mailto:wine-bugs(a)winehq.org">wine-bugs(a)winehq.org</a> - A medium traffic (10/day) read-only list for monitoring submissions to the + A high traffic (150/day) read-only list for monitoring activity on the <a href="http://bugs.winehq.org/">Bug Tracking Database</a>. <li>

1 0

Matteo Bruni : d3dx9: Support ps_2_0-style dcl instruction in the shader assembler.
by Alexandre Julliard June 9, 2010

June 9, 2010

Module: wine Branch: master Commit: 00951f84ed6acddc79230bde63edbbda0dba7e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00951f84ed6acddc79230bde6… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 00:50:57 2010 +0200 d3dx9: Support ps_2_0-style dcl instruction in the shader assembler. --- dlls/d3dx9_36/asmparser.c | 23 +++++++++++++++++++++-- dlls/d3dx9_36/asmshader.y | 34 ++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/bytecodewriter.c | 25 ++++++++++++++----------- dlls/d3dx9_36/tests/asm.c | 13 +++++++++++++ 4 files changed, 82 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 071a1b8..b20479a 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -133,6 +133,25 @@ static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num, } } +static void asmparser_dcl_input_ps_2(struct asm_parser *This, DWORD usage, DWORD num, + DWORD mod, const struct shader_reg *reg) { + struct instruction instr; + + if(!This->shader) return; + if(usage != 0) { + asmparser_message(This, "Line %u: Unsupported usage in dcl instruction\n", This->line_no); + set_parse_status(This, PARSE_ERR); + return; + } + instr.dstmod = mod; + instr.shift = 0; + This->funcs->dstreg(This, &instr, reg); + if(!record_declaration(This->shader, usage, num, mod, FALSE, instr.dst.regnum, instr.dst.writemask, FALSE)) { + ERR("Out of memory\n"); + set_parse_status(This, PARSE_ERR); + } +} + static void asmparser_dcl_sampler(struct asm_parser *This, DWORD samptype, DWORD mod, DWORD regnum, unsigned int line_no) { @@ -811,7 +830,7 @@ static const struct asmparser_backend parser_ps_2 = { asmparser_coissue_unsupported, asmparser_dcl_output, - asmparser_dcl_input, + asmparser_dcl_input_ps_2, asmparser_dcl_sampler, asmparser_end, @@ -831,7 +850,7 @@ static const struct asmparser_backend parser_ps_2_x = { asmparser_coissue_unsupported, asmparser_dcl_output, - asmparser_dcl_input, + asmparser_dcl_input_ps_2, asmparser_dcl_sampler, asmparser_end, diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 9bd84a3..fa6d00c 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -573,6 +573,40 @@ instruction: INSTR_ADD omods dreg ',' sregs reg.writemask = $5; asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, $3.mod, &reg); } + | INSTR_DCL omods REG_INPUT + { + struct shader_reg reg; + TRACE("Input reg declaration\n"); + if($2.shift != 0) { + asmparser_message(&asm_ctx, "Line %u: Shift modifier not allowed here\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } + ZeroMemory(&reg, sizeof(reg)); + reg.type = BWRITERSPR_INPUT; + reg.regnum = $3; + reg.rel_reg = NULL; + reg.srcmod = 0; + reg.writemask = BWRITERSP_WRITEMASK_ALL; + asm_ctx.funcs->dcl_input(&asm_ctx, 0, 0, $2.mod, &reg); + } + | INSTR_DCL omods REG_INPUT writemask + { + struct shader_reg reg; + TRACE("Input reg declaration\n"); + if($2.shift != 0) { + asmparser_message(&asm_ctx, "Line %u: Shift modifier not allowed here\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } + ZeroMemory(&reg, sizeof(reg)); + reg.type = BWRITERSPR_INPUT; + reg.regnum = $3; + reg.rel_reg = NULL; + reg.srcmod = 0; + reg.writemask = $4; + asm_ctx.funcs->dcl_input(&asm_ctx, 0, 0, $2.mod, &reg); + } | INSTR_DCL sampdcl omods REG_SAMPLER { TRACE("Sampler declared\n"); diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index 5fcc248..b444365 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -343,11 +343,15 @@ static void put_dword(struct bytecode_buffer *buffer, DWORD value) { /****************************************************** * Implementation of the writer functions starts here * ******************************************************/ -static void write_declarations(struct bytecode_buffer *buffer, BOOL len, +static void write_declarations(struct bc_writer *This, + struct bytecode_buffer *buffer, BOOL len, const struct declaration *decls, unsigned int num, DWORD type) { DWORD i; DWORD instr_dcl = D3DSIO_DCL; DWORD token; + struct shader_reg reg; + + ZeroMemory(&reg, sizeof(reg)); if(len) { instr_dcl |= 2 << D3DSI_INSTLENGTH_SHIFT; @@ -366,12 +370,10 @@ static void write_declarations(struct bytecode_buffer *buffer, BOOL len, put_dword(buffer, token); /* Write the dest register */ - token = (1 << 31); /* Bit 31 of non-instruction opcodes is 1 */ - token |= (type << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK; - token |= (d3d9_writemask(decls[i].writemask)) & D3DSP_WRITEMASK_ALL; - token |= decls[i].regnum & D3DSP_REGNUM_MASK; - token |= d3d9_dstmod(decls[i].mod); - put_dword(buffer, token); + reg.type = type; + reg.regnum = decls[i].regnum; + reg.writemask = decls[i].writemask; + This->funcs->dstreg(This, &reg, buffer, 0, decls[i].mod); } } @@ -514,7 +516,7 @@ static void vs_1_x_header(struct bc_writer *This, const struct bwriter_shader *s /* Declare the shader type and version */ put_dword(buffer, This->version); - write_declarations(buffer, FALSE, shader->inputs, shader->num_inputs, D3DSPR_INPUT); + write_declarations(This, buffer, FALSE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_constF(shader, buffer, FALSE); return; } @@ -908,7 +910,7 @@ static void vs_2_header(struct bc_writer *This, /* Declare the shader type and version */ put_dword(buffer, This->version); - write_declarations(buffer, TRUE, shader->inputs, shader->num_inputs, D3DSPR_INPUT); + write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); @@ -1187,6 +1189,7 @@ static void ps_2_header(struct bc_writer *This, const struct bwriter_shader *sha /* Declare the shader type and version */ put_dword(buffer, This->version); + write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_samplers(shader, buffer); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); @@ -1424,8 +1427,8 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha /* Declare the shader type and version */ put_dword(buffer, This->version); - write_declarations(buffer, TRUE, shader->inputs, shader->num_inputs, D3DSPR_INPUT); - write_declarations(buffer, TRUE, shader->outputs, shader->num_outputs, D3DSPR_OUTPUT); + write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); + write_declarations(This, buffer, TRUE, shader->outputs, shader->num_outputs, BWRITERSPR_OUTPUT); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 9ed1be8..5ed286e 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -886,6 +886,11 @@ static void ps_2_0_test(void) { {0xffff0200, 0x0200001f, 0x90000000, 0xa00f0802, 0x03020042, 0x800f0000, 0xb0e40001, 0xa0e40802, 0x0000ffff} }, + { /* shader 11 */ + "ps_2_0\n" + "dcl v0\n", + {0xffff0200, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff} + }, }; exec_tests("ps_2_0", tests, sizeof(tests) / sizeof(tests[0])); @@ -1195,6 +1200,11 @@ static void ps_3_0_test(void) { "dcl_2d_pp s0\n", {0xffff0300, 0x0200001f, 0x90000000, 0xa02f0800, 0x0000ffff} }, + { /* shader 15 */ + "ps_3_0\n" + "dcl v0\n", + {0xffff0300, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff} + }, }; exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0])); @@ -1336,6 +1346,9 @@ static void failure_test(void) { /* shader 42: no modifiers with vs dcl sampler instruction */ "vs_3_0\n" "dcl_2d_pp s0\n", + /* shader 43: can't explicitely declare input registers in ps_2_0 */ + "ps_2_0\n" + "dcl_texcoord0 t0\n", }; HRESULT hr; unsigned int i;

1 0

Paul Vriens : comdlg32: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard June 9, 2010

June 9, 2010

Module: wine Branch: master Commit: a2b21781e30d6b0addc324040f406ce6af1370ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b21781e30d6b0addc324040… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 9 17:25:38 2010 +0200 comdlg32: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- dlls/comdlg32/cdlg_Da.rc | 151 +++++++++++++++++++++++---------------------- 1 files changed, 77 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2b21781e30d6b0addc32…

1 0

Damjan Jovanovic : wine.inf: Also install winhlp32 into \windows\system32.
by Alexandre Julliard June 9, 2010

June 9, 2010

Module: wine Branch: master Commit: 950919ee33898b9ed495f1d549243a3841a97623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=950919ee33898b9ed495f1d54… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jun 8 21:42:24 2010 +0200 wine.inf: Also install winhlp32 into \windows\system32. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index a8b3e6b..8a1a871 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2549,6 +2549,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,ddhelp.exe 11,,dosx.exe 11,,dsound.vxd +11,,winhlp32.exe ; Wow64-only fake dlls [FakeDllsWow64]

1 0

Matteo Bruni : d3dx9: Accept texture coordinate registers in dcl instruction.
by Alexandre Julliard June 9, 2010

June 9, 2010

Module: wine Branch: master Commit: 2fa119f765c005d63a5ad0d9e96d7076a24192c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa119f765c005d63a5ad0d9e… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 00:53:23 2010 +0200 d3dx9: Accept texture coordinate registers in dcl instruction. --- dlls/d3dx9_36/asmshader.y | 36 +++++++++++++++++++++++------------- dlls/d3dx9_36/tests/asm.c | 11 +++++++++++ 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index fa6d00c..0c335b4 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -255,6 +255,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %type <modshift> omodifier %type <comptype> comp %type <declaration> dclusage +%type <reg> dcl_inputreg %type <samplertype> sampdcl %type <rel_reg> rel_reg %type <reg> predicate @@ -539,7 +540,7 @@ instruction: INSTR_ADD omods dreg ',' sregs reg.writemask = $4; asm_ctx.funcs->dcl_output(&asm_ctx, $2.dclusage, $2.regnum, &reg); } - | INSTR_DCL dclusage omods REG_INPUT + | INSTR_DCL dclusage omods dcl_inputreg { struct shader_reg reg; TRACE("Input reg declaration\n"); @@ -549,14 +550,14 @@ instruction: INSTR_ADD omods dreg ',' sregs set_parse_status(&asm_ctx, PARSE_ERR); } ZeroMemory(&reg, sizeof(reg)); - reg.type = BWRITERSPR_INPUT; - reg.regnum = $4; + reg.type = $4.type; + reg.regnum = $4.regnum; reg.rel_reg = NULL; reg.srcmod = 0; reg.writemask = BWRITERSP_WRITEMASK_ALL; asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, $3.mod, &reg); } - | INSTR_DCL dclusage omods REG_INPUT writemask + | INSTR_DCL dclusage omods dcl_inputreg writemask { struct shader_reg reg; TRACE("Input reg declaration\n"); @@ -566,14 +567,14 @@ instruction: INSTR_ADD omods dreg ',' sregs set_parse_status(&asm_ctx, PARSE_ERR); } ZeroMemory(&reg, sizeof(reg)); - reg.type = BWRITERSPR_INPUT; - reg.regnum = $4; + reg.type = $4.type; + reg.regnum = $4.regnum; reg.rel_reg = NULL; reg.srcmod = 0; reg.writemask = $5; asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, $3.mod, &reg); } - | INSTR_DCL omods REG_INPUT + | INSTR_DCL omods dcl_inputreg { struct shader_reg reg; TRACE("Input reg declaration\n"); @@ -583,14 +584,14 @@ instruction: INSTR_ADD omods dreg ',' sregs set_parse_status(&asm_ctx, PARSE_ERR); } ZeroMemory(&reg, sizeof(reg)); - reg.type = BWRITERSPR_INPUT; - reg.regnum = $3; + reg.type = $3.type; + reg.regnum = $3.regnum; reg.rel_reg = NULL; reg.srcmod = 0; reg.writemask = BWRITERSP_WRITEMASK_ALL; asm_ctx.funcs->dcl_input(&asm_ctx, 0, 0, $2.mod, &reg); } - | INSTR_DCL omods REG_INPUT writemask + | INSTR_DCL omods dcl_inputreg writemask { struct shader_reg reg; TRACE("Input reg declaration\n"); @@ -600,8 +601,8 @@ instruction: INSTR_ADD omods dreg ',' sregs set_parse_status(&asm_ctx, PARSE_ERR); } ZeroMemory(&reg, sizeof(reg)); - reg.type = BWRITERSPR_INPUT; - reg.regnum = $3; + reg.type = $3.type; + reg.regnum = $3.regnum; reg.rel_reg = NULL; reg.srcmod = 0; reg.writemask = $4; @@ -617,7 +618,7 @@ instruction: INSTR_ADD omods dreg ',' sregs } asm_ctx.funcs->dcl_sampler(&asm_ctx, $2, $3.mod, $4, asm_ctx.line_no); } - | INSTR_DCL sampdcl omods REG_INPUT + | INSTR_DCL sampdcl omods dcl_inputreg { TRACE("Error rule: sampler decl of input reg\n"); asmparser_message(&asm_ctx, "Line %u: Sampler declarations of input regs is not valid\n", @@ -1342,6 +1343,15 @@ dclusage: USAGE_POSITION $$.dclusage = BWRITERDECLUSAGE_SAMPLE; } +dcl_inputreg: REG_INPUT + { + $$.regnum = $1; $$.type = BWRITERSPR_INPUT; + } + | REG_TEXTURE + { + $$.regnum = $1; $$.type = BWRITERSPR_TEXTURE; + } + sampdcl: SAMPTYPE_1D { $$ = BWRITERSTT_1D; diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 5ed286e..dda0e2b 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -891,6 +891,17 @@ static void ps_2_0_test(void) { "dcl v0\n", {0xffff0200, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff} }, + { /* shader 12 */ + "ps_2_0\n" + "dcl t0.xyz\n" + "dcl t1\n", + {0xffff0200, 0x0200001f, 0x80000000, 0xb0070000, 0x0200001f, 0x80000000, 0xb00f0001, 0x0000ffff} + }, + { /* shader 13 */ + "ps_2_0\n" + "dcl_pp t0\n", + {0xffff0200, 0x0200001f, 0x80000000, 0xb02f0000, 0x0000ffff} + }, }; exec_tests("ps_2_0", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Matteo Bruni : d3dx9: Mark builtin compatibility declarations in the shader assembler.
by Alexandre Julliard June 9, 2010

June 9, 2010

Module: wine Branch: master Commit: 9a8ffc916cb1f65e2118c7deba11bc91a4e7cc42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8ffc916cb1f65e2118c7deb… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 00:35:10 2010 +0200 d3dx9: Mark builtin compatibility declarations in the shader assembler. This way we can output declarations in the bytecode without polluting them with the builtin ones. --- dlls/d3dx9_36/asmparser.c | 50 +++++++++++++++++++------------------- dlls/d3dx9_36/bytecodewriter.c | 12 ++++++++- dlls/d3dx9_36/d3dx9_36_private.h | 5 +++- 3 files changed, 40 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a8ffc916cb1f65e2118c…

1 0

Paul Vriens : notepad: Update the Danish translation.
by Alexandre Julliard June 9, 2010

June 9, 2010

Module: wine Branch: master Commit: 6f01ab7eb13135fbb11d2db8683e1b8062d29b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f01ab7eb13135fbb11d2db86… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 9 15:26:49 2010 +0200 notepad: Update the Danish translation. --- programs/notepad/Da.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc index 1068b87..1ab5bac 100644 --- a/programs/notepad/Da.rc +++ b/programs/notepad/Da.rc @@ -49,11 +49,11 @@ POPUP "&Rediger" { MENUITEM "&Indsæt\tCtrl+V", CMD_PASTE MENUITEM "&Slet\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "Marker &alt", CMD_SELECT_ALL - MENUITEM "&Dato/tid\tF5", CMD_TIME_DATE + MENUITEM "Marker &alt\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Dato og klokkeslæt\tF5", CMD_TIME_DATE MENUITEM SEPARATOR - MENUITEM "Automatisk &linjeskift", CMD_WRAP - MENUITEM "&Font...", CMD_FONT + MENUITEM "&Tekstombrydning", CMD_WRAP + MENUITEM "&Skrifttype...", CMD_FONT } POPUP "&Søg" { MENUITEM "&Søg...", CMD_SEARCH @@ -65,7 +65,7 @@ POPUP "&Hjælp" { MENUITEM "&Søg efter hjælp om...", CMD_HELP_SEARCH MENUITEM "&Brug af Hjælp", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&Om Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Om Notesblok", CMD_HELP_ABOUT_NOTEPAD } }

1 0

Paul Vriens : shell32: Update the Danish translation.
by Alexandre Julliard June 9, 2010

June 9, 2010

Module: wine Branch: master Commit: a60131e126a369ef033c31e07b711ac4bb3933d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60131e126a369ef033c31e07… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 9 15:30:30 2010 +0200 shell32: Update the Danish translation. --- dlls/shell32/shell32_Da.rc | 82 ++++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/shell32/shell32_Da.rc b/dlls/shell32/shell32_Da.rc index 424ed84..2700213 100644 --- a/dlls/shell32/shell32_Da.rc +++ b/dlls/shell32/shell32_Da.rc @@ -39,7 +39,7 @@ MENU_002 MENU DISCARDABLE BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "&Vis" BEGIN MENUITEM "&Store Ikoner", FCIDM_SHVIEW_BIGICON MENUITEM "S&må Ikoner", FCIDM_SHVIEW_SMALLICON @@ -47,26 +47,26 @@ BEGIN MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Arrangér &Ikoner" + POPUP "Sortere &Ikoner" BEGIN - MENUITEM "efter &navn", 0x30 /* column 0 */ - MENUITEM "efter &type", 0x32 /* column 2 */ - MENUITEM "efter &størrelse", 0x31 /* ... */ - MENUITEM "efter &dato", 0x33 + MENUITEM "Efter &Navn", 0x30 /* column 0 */ + MENUITEM "Efter &Type", 0x32 /* column 2 */ + MENUITEM "Efter &Størrelse", 0x31 /* ... */ + MENUITEM "Efter &Ændringsdato", 0x33 MENUITEM SEPARATOR - MENUITEM "&Autoarrangér", FCIDM_SHVIEW_AUTOARRANGE + MENUITEM "&Arranger Automatisk", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Opstil ikoner", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "A&rranger ikoner i forhold til gitter", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR MENUITEM "Opdater", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Indsæt", FCIDM_SHVIEW_INSERT MENUITEM "Indsæt som genvej", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - POPUP "New" + POPUP "Ny" BEGIN - MENUITEM "Ny &folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Ny &genvej", FCIDM_SHVIEW_NEWLINK + MENUITEM "&Mappe", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "&Genvej", FCIDM_SHVIEW_NEWLINK MENUITEM SEPARATOR END MENUITEM SEPARATOR @@ -104,7 +104,7 @@ BEGIN MENUITEM "E&xit", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&Vis" BEGIN MENUITEM "&Store Ikoner", FCIDM_SHVIEW_BIGICON MENUITEM "S&må Ikoner", FCIDM_SHVIEW_SMALLICON @@ -112,15 +112,15 @@ BEGIN MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "&Hjælp" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "&Om Kontrolpanelet...", IDM_CPANEL_ABOUT END END SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK -CAPTION "Vælg folder" +CAPTION "Søg efter mappe" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -185,8 +185,8 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv navnet på et Program, Mappe, Document eller Internet Ressource, for at få Wine til at åbne det.", 12289, 36, 11, 182, 18 - LTEXT "&Åben:", 12305, 7, 39, 24, 10 + LTEXT "Skriv navnet på et program, en mappe, et dokument eller Internet ressource, og Wine åbner det for dig.", 12289, 36, 11, 182, 18 + LTEXT "&Åbn:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Annuller", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP @@ -217,7 +217,7 @@ STRINGTABLE /* special folders */ IDS_DESKTOP "Skrivebord" IDS_MYCOMPUTER "Min Computer" - IDS_RECYCLEBIN_FOLDER_NAME "Skraldespand" + IDS_RECYCLEBIN_FOLDER_NAME "Papirkurven" IDS_CONTROLPANEL "Control Panel" /* context menus */ @@ -228,23 +228,23 @@ STRINGTABLE IDS_SELECT "Vælg" IDS_OPEN "Åben" - IDS_CREATEFOLDER_DENIED "Kan ikke lave ny folder: Ingen rettigheder." - IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" - IDS_DELETEITEM_CAPTION "Confirm file deletion" - IDS_DELETEFOLDER_CAPTION "Confirm folder deletion" - IDS_DELETEITEM_TEXT "Er du sikker på at du vil slette '%1'?" - IDS_DELETEMULTIPLE_TEXT "Er du sikker på at du vil slette disse %1 filer?" - IDS_DELETESELECTED_TEXT "Er du sikker på at du vil slette de markede filer?" - IDS_TRASHITEM_TEXT "Er du sikker på at du vil smide '%1' i skraldespanden?" - IDS_TRASHFOLDER_TEXT "Er du sikker på at du vil smide '%1' og al dens indhold ned i skraldespanden?" - IDS_TRASHMULTIPLE_TEXT "Er du sikker på at du vil smide disse %1 filer ned i skraldespanden?" - IDS_CANTTRASH_TEXT "filen '%1' kan ikke smides i skraldespanden. Vil du slette den istedet for?" - IDS_OVERWRITEFILE_TEXT "Folderen har allerede en fil kaldt '%1'.\n\nVil du overskrive den?" - IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" - IDS_OVERWRITEFOLDER_TEXT "Denne folder har allerede en folder med navnet '%1'.\n\n"\ - "Hvis filerne i destination folderen har de samme navne som filerne i den\n"\ - "markerede folder vil de blive overskrevet. Vil du stadig rykke eller kopiere\n"\ - "denne folder?" + IDS_CREATEFOLDER_DENIED "Kunne ikke oprette en ny mappe: Adgang nægtet." + IDS_CREATEFOLDER_CAPTION "Fejl ved oprettelse af ny mappe" + IDS_DELETEITEM_CAPTION "Bekræft sletning af fil" + IDS_DELETEFOLDER_CAPTION "Bekræft sletning af mappe" + IDS_DELETEITEM_TEXT "Er du sikker på du vil slette '%1'?" + IDS_DELETEMULTIPLE_TEXT "Er du sikker på du vil slette disse %1 filer?" + IDS_DELETESELECTED_TEXT "Er du sikker på du vil slette de(n) valgte fil(er)?" + IDS_TRASHITEM_TEXT "Er du sikker på at du vil sende '%1' til papirkurven?" + IDS_TRASHFOLDER_TEXT "Er du sikker på at du vil sende '%1' og alt dens indhold til papirkurven?" + IDS_TRASHMULTIPLE_TEXT "Er du sikker på at du vil sende disse %1 filer til papirkurven?" + IDS_CANTTRASH_TEXT "Filen '%1' kunne ikke sendes til papirkurven. Ønsker du at slette den permanent istedet for?" + IDS_OVERWRITEFILE_TEXT "Denne mappe indeholder allerede en fil kaldet '%1'.\n\nVil du overskrive den?" + IDS_OVERWRITEFILE_CAPTION "Bekræft overskrivning af fil" + IDS_OVERWRITEFOLDER_TEXT "Denne mappe indeholder allerede en mappe med navnet '%1'.\n\n"\ + "Hvis filerne i destinationsmappen har de samme navne som filerne i\n"\ + "den markerede mappe, vil de blive erstattet. Ønsker du stadig at flytte eller kopiere\n"\ + "mappen?" /* message box strings */ IDS_RESTART_TITLE "Genstart" @@ -278,18 +278,18 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Lokale indstillinger\\History" IDS_PROGRAM_FILES "Program Files" - IDS_MYPICTURES "My Pictures" - IDS_PROGRAM_FILES_COMMON "Programmer\\Common Files" + IDS_MYPICTURES "Mine Billeder" + IDS_PROGRAM_FILES_COMMON "Programmer\Fælles Filer" IDS_COMMON_DOCUMENTS "Documenter" - IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" + IDS_ADMINTOOLS "Start Menu\Programmer\Administrative Værktøjer" IDS_COMMON_MUSIC "Dokumenter\\Min Musik" IDS_COMMON_PICTURES "Dokumenter\\Mine Billeder" IDS_COMMON_VIDEO "Dokumenter\\Mine Film" - IDS_CDBURN_AREA "Lokale indstillinger\\Application Data\\Microsoft\\CD Burning" + IDS_CDBURN_AREA "Lokale indstillinger\Applikations Data\Microsoft\CD Brændning" - IDS_NEWFOLDER "Ny Folder" + IDS_NEWFOLDER "Ny Mappe" - IDS_CPANEL_TITLE "Wine Control Panel" + IDS_CPANEL_TITLE "Wine Kontrolpanel" IDS_CPANEL_NAME "Name" IDS_CPANEL_DESCRIPTION "Description"

1 0

Paul Vriens : regedit: Update the Danish translation.
by Alexandre Julliard June 9, 2010

June 9, 2010

Module: wine Branch: master Commit: b0f32c551ab17297ae01053912c808815e711dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f32c551ab17297ae0105391… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 9 15:25:31 2010 +0200 regedit: Update the Danish translation. --- programs/regedit/Da.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/Da.rc b/programs/regedit/Da.rc index 99eda33..48ff820 100644 --- a/programs/regedit/Da.rc +++ b/programs/regedit/Da.rc @@ -298,10 +298,10 @@ BEGIN IDS_TOO_BIG_VALUE "Værdien er for stor (%u)" 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_DELETE_BOX_TEXT_MULTIPLE "Er du sikker på du vil slette disse værdier?" IDS_NEWKEY "Ny nøgle #%d" IDS_NEWVALUE "Ny værdi #%d" - IDS_NOTFOUND "Fandt ikke søgestrengen «%s»" + IDS_NOTFOUND "Fandt ikke søgestrengen '%s'" END STRINGTABLE DISCARDABLE

1 0

Paul Vriens : winecfg: Update the Danish translation.
by Alexandre Julliard June 9, 2010

June 9, 2010

Module: wine Branch: master Commit: 17811a81c9fc40b52f4a33e15f49ad568c59b669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17811a81c9fc40b52f4a33e15… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 9 15:23:42 2010 +0200 winecfg: Update the Danish translation. --- programs/winecfg/Da.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc index 9e3b875..6e594cc 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc @@ -232,7 +232,7 @@ BEGIN IDS_WINECFG_TITLE_APP "Wine configurering for %s" IDS_THEMEFILE "Tema filer (*.msstyles; *.theme)" IDS_THEMEFILE_SELECT "Vælg en tema fil" - IDS_AUDIO_MISSING "Der er ikke nogen lyd driver valgt i registrings databasen.\n\nEn rekommenderet driver er blevet valgt for dig.\nDu kan bruge denne driver eller vælge en anden.\nDu skal klikke anvend for at valget bliver taget i brug." + IDS_AUDIO_MISSING "Der er øjeblikket ingen lyd driver angivet i registreringsdatabasen.\n\nEn anbefalet driver er blevet valgt for dig.\nDu kan bruge denne driver eller vælge en anden.\nDu skal klikke på 'Anvend' for at få dit valg til at træde i kraft." IDS_SHELL_FOLDER "Shell folder" IDS_LINKS_TO "Links to" END

1 0