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

Paul Vriens : avifile32: Update the Danish translation and convert to UTF-8 .
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: c516ecbf9b9f4f2abeacb8dc031586a6dcf2b836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c516ecbf9b9f4f2abeacb8dc0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 20:40:56 2010 +0200 avifile32: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- dlls/avifil32/avifile_Da.rc | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/avifil32/avifile_Da.rc b/dlls/avifil32/avifile_Da.rc index 22f4576..b8a5191 100644 --- a/dlls/avifil32/avifile_Da.rc +++ b/dlls/avifil32/avifile_Da.rc @@ -1,5 +1,6 @@ /* * Copyright 2008 Jens Albretsen + * 2010 Thomas Larsen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,8 @@ #include "avifile_private.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 @@ -25,15 +28,15 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Komprimerings indstillinger" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&V�lg en stream:",-1,2,5,154,10 + LTEXT "&Vælg stream:",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "I&ndstillinger...",IDC_OPTIONS,170,17,50,14 AUTOCHECKBOX "&Interleave hver",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "billeder",-1,129,43,36,9 - LTEXT "Nuv�rende format:",-1,3,56,53,9 - LTEXT "This space for rent",IDC_FORMATTEXT,55,56,90,26 + LTEXT "Billeder",-1,129,43,36,9 + LTEXT "Nuværende format:",-1,3,56,53,9 + LTEXT "Denne plads er til leje",IDC_FORMATTEXT,55,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14 PUSHBUTTON "Annuller",IDCANCEL,170,61,50,14 END @@ -43,10 +46,10 @@ STRINGTABLE DISCARDABLE IDS_WAVESTREAMFORMAT "Lydkurve: %s" IDS_WAVEFILETYPE "Lydkurve" IDS_ALLMULTIMEDIA "Alle multimedia filer" - IDS_ALLFILES "Alle files (*.*)(a)*.*" + IDS_ALLFILES "Alle filer (*.*)(a)*.*" IDS_VIDEO "video" - IDS_AUDIO "audio" + IDS_AUDIO "lyd" IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "Wine AVI-default-filehandler" + IDS_AVIFILETYPE "Wine AVI-standard-filehandler" IDS_UNCOMPRESSED "ukomprimeret" }

1 0

Paul Vriens : winecfg: Update the Danish translation.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 2e01e4cb3cd9b145477d1d0e340b21583fb666f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e01e4cb3cd9b145477d1d0e3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 20:47:02 2010 +0200 winecfg: Update the Danish translation. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- programs/winecfg/Da.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc index 7b2ae81..126c26d 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc @@ -57,11 +57,11 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Program indstillinger ",IDC_STATIC, 8,4,244,240 - LTEXT "Wine kan efterligne forskellige versioner af Windows for hvert program. Tabben hænger sammen med Biblioteker og Grafik tabbene for at tillade ændring af system eller per program indstillinger.", - IDC_STATIC,15,20,227,30 + LTEXT "Wine kan efterligne forskellige Windows-versioner for hvert program. Denne fane er knyttet til Biblioteker og Grafik faner, for at give dig mulighed for at ændre systemsider eller per program indstillinger i disse faneblade.", + IDC_STATIC,15,20,227,40 CONTROL "Programmer",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, - 15,50,230,150 - PUSHBUTTON "&Tilfø program...",IDC_APP_ADDAPP, 90,204,75,14 + 15,60,230,140 + PUSHBUTTON "&Tilføj program...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "&Fjern program",IDC_APP_REMOVEAPP, 170,204,75,14 LTEXT "&Windows version:",IDC_STATIC,17,226,58,8 COMBOBOX IDC_WINVER,83,224,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -178,7 +178,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Driver valg ",IDC_STATIC,8,4,244,210 - LTEXT "Vælg en lyd driver ved at afkrydse den ønskede driver. Slå lyden fra ved at fravælge alle drivere. Valg af flere drivere er ikke rekommenderet. Konfigurér driver ved at højre klikke på den.",IDC_STATIC,15,20,227,30 + LTEXT "Vælg en lyd driver ved at afkrydse den ønskede driver. Slå lyden fra ved at fravælge alle drivere. Valg af flere drivere er ikke anbefalet. Konfigurér driver ved at højre klikke på den.",IDC_STATIC,15,20,227,30 CONTROL "Enheder",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,155 PUSHBUTTON "&Test lyd",IDC_AUDIO_TEST,170,50,59,14 PUSHBUTTON "&Kontrol panel",IDC_AUDIO_CONTROL_PANEL,170,70,59,14

1 0

Matteo Bruni : d3dx9: Fix get_regname debug function.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: a262fde88c39d1a49fcd193e6372f766886c8d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a262fde88c39d1a49fcd193e6… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 1 01:27:28 2010 +0200 d3dx9: Fix get_regname debug function. --- dlls/d3dx9_36/asmutils.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/asmutils.c b/dlls/d3dx9_36/asmutils.c index bd6bcea..4fc73a5 100644 --- a/dlls/d3dx9_36/asmutils.c +++ b/dlls/d3dx9_36/asmutils.c @@ -264,13 +264,10 @@ static const char *get_regname(const struct shader_reg *reg, shader_type st) { return wine_dbg_sprintf("v%u", reg->regnum); case BWRITERSPR_CONST: return wine_dbg_sprintf("c%u", reg->regnum); - /* case BWRITERSPR_ADDR: */ + case BWRITERSPR_ADDR: + return wine_dbg_sprintf("a%u", reg->regnum); case BWRITERSPR_TEXTURE: - if(st == ST_VERTEX) { - return wine_dbg_sprintf("a%u", reg->regnum); - } else { - return wine_dbg_sprintf("t%u", reg->regnum); - } + return wine_dbg_sprintf("t%u", reg->regnum); case BWRITERSPR_RASTOUT: switch(reg->regnum) { case BWRITERSRO_POSITION: return "oPos"; @@ -280,9 +277,10 @@ static const char *get_regname(const struct shader_reg *reg, shader_type st) { } case BWRITERSPR_ATTROUT: return wine_dbg_sprintf("oD%u", reg->regnum); - /* case BWRITERSPR_TEXCRDOUT: */ + case BWRITERSPR_TEXCRDOUT: + return wine_dbg_sprintf("oT%u", reg->regnum); case BWRITERSPR_OUTPUT: - return wine_dbg_sprintf("o[T]%u", reg->regnum); + return wine_dbg_sprintf("o%u", reg->regnum); case BWRITERSPR_CONSTINT: return wine_dbg_sprintf("i%u", reg->regnum); case BWRITERSPR_COLOROUT: @@ -305,7 +303,8 @@ static const char *get_regname(const struct shader_reg *reg, shader_type st) { return wine_dbg_sprintf("l%u", reg->regnum); case BWRITERSPR_PREDICATE: return wine_dbg_sprintf("p%u", reg->regnum); - default: return "unknown regname"; + default: + return wine_dbg_sprintf("unknown regname %#x", reg->type); } }

1 0

Matteo Bruni : d3dx9: Remove stray debug trace.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: b45a17c7b3abf98ae7584ac7d892d14a4e3662bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45a17c7b3abf98ae7584ac7d… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 1 01:33:36 2010 +0200 d3dx9: Remove stray debug trace. --- dlls/d3dx9_36/bytecodewriter.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index 84fefee..7e7cace 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -829,7 +829,6 @@ static void instr_handler(struct bc_writer *This, const struct instruction *instr, struct bytecode_buffer *buffer) { DWORD token = d3d9_opcode(instr->opcode); - TRACE("token: %x\n", token); This->funcs->opcode(This, instr, token, buffer); if(instr->has_dst) This->funcs->dstreg(This, &instr->dst, buffer, instr->shift, instr->dstmod);

1 0

Matteo Bruni : d3dx9: Make D3DXCompileShader stub more verbose.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: bc4221740170dbacbda7f27c560e16eb2678ee56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4221740170dbacbda7f27c5… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon May 31 20:01:12 2010 +0200 d3dx9: Make D3DXCompileShader stub more verbose. --- dlls/d3dx9_36/shader.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 3aeaf78..b226fa6 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -644,9 +644,13 @@ HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData, LPD3DXBUFFER* ppErrorMsgs, LPD3DXCONSTANTTABLE * ppConstantTable) { - FIXME("(%p, %d, %p, %p, %p, %p, %d, %p, %p, %p): stub\n", - pSrcData, srcDataLen, pDefines, pInclude, pFunctionName, - pProfile, Flags, ppShader, ppErrorMsgs, ppConstantTable); + FIXME("(%p, %d, %p, %p, %s, %s, %x, %p, %p, %p): stub\n", + pSrcData, srcDataLen, pDefines, pInclude, debugstr_a(pFunctionName), + debugstr_a(pProfile), Flags, ppShader, ppErrorMsgs, ppConstantTable); + + TRACE("Shader source:\n"); + TRACE("%s\n", debugstr_an(pSrcData, srcDataLen)); + return D3DERR_INVALIDCALL; }

1 0

Andrew Nguyen : gdi32/tests: Uncomment and enhance a Win9x-specific Restore /SaveDC test.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 682f0dcf1a8e121461dd98af7d04285ead067812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682f0dcf1a8e121461dd98af7… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 1 08:03:11 2010 -0500 gdi32/tests: Uncomment and enhance a Win9x-specific Restore/SaveDC test. --- dlls/gdi32/tests/dc.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 193832c..687a98f 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -162,15 +162,35 @@ static void test_savedc(void) ret = RestoreDC(hdc, 3); ok(!ret, "ret = %d\n", ret); - /* Under win98 the following two succeed and both clear the save stack + /* Under Win9x the following RestoreDC call succeeds and clears the save stack. */ + ret = RestoreDC(hdc, -3); + ok(!ret || + broken(ret), /* Win9x */ + "ret = %d\n", ret); + + /* Trying to clear an empty save stack fails. */ ret = RestoreDC(hdc, -3); ok(!ret, "ret = %d\n", ret); + + ret = SaveDC(hdc); + ok(ret == 3 || + broken(ret == 1), /* Win9x */ + "ret = %d\n", ret); + + /* Under Win9x the following RestoreDC call succeeds and clears the save stack. */ + ret = RestoreDC(hdc, 0); + ok(!ret || + broken(ret), /* Win9x */ + "ret = %d\n", ret); + + /* Trying to clear an empty save stack fails. */ ret = RestoreDC(hdc, 0); ok(!ret, "ret = %d\n", ret); - */ ret = RestoreDC(hdc, 1); - ok(ret, "ret = %d\n", ret); + ok(ret || + broken(!ret), /* Win9x */ + "ret = %d\n", ret); DeleteDC(hdc); }

1 0

Andrew Nguyen : gdi32: Fix parameter handling of GetBoundsRect.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 9d5a848df103e2cb594a259e31897d5f355595bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5a848df103e2cb594a259e3… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 1 08:03:24 2010 -0500 gdi32: Fix parameter handling of GetBoundsRect. --- dlls/gdi32/dc.c | 10 +++++-- dlls/gdi32/tests/dc.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5f304a2..f3a62bd 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1534,9 +1534,13 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) if ( !dc ) return 0; - if (rect) *rect = dc->BoundsRect; - - ret = ((dc->flags & DC_BOUNDS_SET) ? DCB_SET : DCB_RESET); + if (rect) + { + *rect = dc->BoundsRect; + ret = ((dc->flags & DC_BOUNDS_SET) ? DCB_SET : DCB_RESET); + } + else + ret = 0; if (flags & DCB_RESET) { diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 687a98f..b081376 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -494,6 +494,68 @@ todo_wine ok(ret, "UnregisterClassA failed\n"); } +static void test_boundsrect_invalid(void) +{ + HDC hdc; + RECT rect, expect; + UINT ret; + + hdc = GetDC(NULL); + ok(hdc != NULL, "GetDC failed\n"); + + ret = GetBoundsRect(hdc, NULL, 0); + ok(ret == 0 || + broken(ret == DCB_RESET), /* Win9x */ + "Expected GetBoundsRect to return 0, got %u\n", ret); + + ret = GetBoundsRect(hdc, NULL, ~0U); + ok(ret == 0 || + broken(ret == DCB_RESET), /* Win9x */ + "Expected GetBoundsRect to return 0, got %u\n", ret); + + if (GetBoundsRect(hdc, NULL, 0) == DCB_RESET) + win_skip("Win9x fails catastrophically with first GetBoundsRect call\n"); + else + { + /* Test parameter handling order. */ + SetRect(&rect, 0, 0, 50, 50); + ret = SetBoundsRect(hdc, &rect, DCB_SET); + ok(ret & DCB_RESET, + "Expected return flag DCB_RESET to be set, got %u\n", ret); + + ret = GetBoundsRect(hdc, NULL, DCB_RESET); + ok(ret == 0, + "Expected GetBoundsRect to return 0, got %u\n", ret); + + ret = GetBoundsRect(hdc, &rect, 0); + ok(ret == DCB_RESET, + "Expected GetBoundsRect to return DCB_RESET, got %u\n", ret); + SetRect(&expect, 0, 0, 0, 0); + ok(EqualRect(&rect, &expect), + "Expected output rectangle (0,0)-(0,0), got (%d,%d)-(%d,%d)\n", + rect.left, rect.top, rect.right, rect.bottom); + } + + if (GetBoundsRect(hdc, NULL, 0) == DCB_RESET) + win_skip("Win9x fails catastrophically with NULL device context parameter\n"); + else + { + ret = GetBoundsRect(NULL, NULL, 0); + ok(ret == 0, "Expected GetBoundsRect to return 0, got %u\n", ret); + + ret = GetBoundsRect(NULL, NULL, ~0U); + ok(ret == 0, "Expected GetBoundsRect to return 0, got %u\n", ret); + + ret = SetBoundsRect(NULL, NULL, 0); + ok(ret == 0, "Expected SetBoundsRect to return 0, got %u\n", ret); + + ret = SetBoundsRect(NULL, NULL, ~0U); + ok(ret == 0, "Expected SetBoundsRect to return 0, got %u\n", ret); + } + + DeleteDC(hdc); +} + START_TEST(dc) { test_savedc(); @@ -502,4 +564,5 @@ START_TEST(dc) test_CreateCompatibleDC(); test_DC_bitmap(); test_DeleteDC(); + test_boundsrect_invalid(); }

1 0

Paul Vriens : notepad: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: dd243b7fcf8a676be30db43c3b6f34d3cca72a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd243b7fcf8a676be30db43c3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 14:30:13 2010 +0200 notepad: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- programs/notepad/Da.rc | 59 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 19 deletions(-) diff --git a/programs/notepad/Da.rc b/programs/notepad/Da.rc index d152cfe..1068b87 100644 --- a/programs/notepad/Da.rc +++ b/programs/notepad/Da.rc @@ -4,6 +4,7 @@ * Copyright 1998 Henrik Olsen <henrik(a)iaeste.dk> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2008 Jens Albretsen <jens(a)albretsen.dk> + * 2010 Thomas Larsen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,18 +23,20 @@ #include "notepad_res.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT MAIN_MENU MENU { POPUP "&Filer" { MENUITEM "&Ny\tCtrl+N", CMD_NEW - MENUITEM "�&bn...\tCtrl+O", CMD_OPEN + MENUITEM "Å&bn...\tCtrl+O", CMD_OPEN MENUITEM "&Gem\tCtrl+S", CMD_SAVE MENUITEM "Gem so&m...", CMD_SAVE_AS MENUITEM SEPARATOR MENUITEM "&Udskriv...\tCtrl+P", CMD_PRINT - MENUITEM "Side&ops�tning...", CMD_PAGE_SETUP + MENUITEM "Side&opsætning...", CMD_PAGE_SETUP MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "&Afslut", CMD_EXIT @@ -43,7 +46,7 @@ POPUP "&Rediger" { MENUITEM SEPARATOR MENUITEM "&Klip\tCtrl+X", CMD_CUT MENUITEM "K&opier\tCtrl+C", CMD_COPY - MENUITEM "&Inds�t\tCtrl+V", CMD_PASTE + MENUITEM "&Indsæt\tCtrl+V", CMD_PASTE MENUITEM "&Slet\tDel", CMD_DELETE MENUITEM SEPARATOR MENUITEM "Marker &alt", CMD_SELECT_ALL @@ -52,14 +55,15 @@ POPUP "&Rediger" { MENUITEM "Automatisk &linjeskift", CMD_WRAP MENUITEM "&Font...", CMD_FONT } -POPUP "&S�g" { - MENUITEM "&S�g...", CMD_SEARCH - MENUITEM "&Find n�ste\tF3", CMD_SEARCH_NEXT +POPUP "&Søg" { + MENUITEM "&Søg...", CMD_SEARCH + MENUITEM "&Find næste\tF3", CMD_SEARCH_NEXT + MENUITEM "&Erstat...\tCtrl+H", CMD_REPLACE } -POPUP "&Hj�lp" { +POPUP "&Hjælp" { MENUITEM "&Indhold", CMD_HELP_CONTENTS - MENUITEM "&S�g efter hj�lp om...", CMD_HELP_SEARCH - MENUITEM "&Brug af Hj�lp", CMD_HELP_ON_HELP + 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 } @@ -70,7 +74,7 @@ POPUP "&Hj DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Sideops�tning" +CAPTION "Sideopsætning" { LTEXT "&Sidehoved:", 0x140, 10, 07, 40, 15 EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP @@ -82,16 +86,24 @@ LTEXT "&Venstre:", 0x145, 20, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Top:", 0x148, 20, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -LTEXT "&H�jre:", 0x14B, 100, 55, 30, 10, WS_CHILD +LTEXT "&Højre:", 0x14B, 100, 55, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP LTEXT "&Bund:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP PUSHBUTTON "Annuller", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&Hj�lp", IDHELP, 180, 39, 40, 15, WS_TABSTOP +PUSHBUTTON "&Hjælp", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kodning:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -110,14 +122,23 @@ STRING_TEXT_FILES_TXT, "Tekst filer (*.txt)" STRING_TOOLARGE, "Filen '%s' er for stor til Notesblok. \ \nBrug en anden editor til at redigere filen." STRING_NOTEXT, "Du har ikke skrevet noget tekst. \ -\nSkriv noget tekst, og pr�v s� igen" +\nSkriv noget tekst, og prøv så igen" STRING_DOESNOTEXIST, "Filen '%s'\nfindes ikke\n\n \ -�nsker du at oprette en ny fil ?" -STRING_NOTSAVED, "Filen '%s'\ner blevet �ndret\n\n \ -Vil du gemme �ndringerne ?" +Ønsker du at oprette en ny fil ?" +STRING_NOTSAVED, "Filen '%s'\ner blevet ændret\n\n \ +Vil du gemme ændringerne ?" STRING_NOTFOUND, "Kan ikke finde '%s'." -STRING_OUT_OF_MEMORY, "Der er ikke nok hukommelse til at udf�re \ -denne operation.\nAfslut et eller flere aktive programmer for at frig�re \ -hukommelse, og pr�v igen." +STRING_OUT_OF_MEMORY, "Der er ikke nok hukommelse til at udføre \ +denne operation.\nAfslut et eller flere aktive programmer for at frigøre \ +hukommelse, og prøv igen." + +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Denne fil indeholder Unicode-tegn, som vil gå tabt, hvis\n\ +du gemmer denne fil med %s som kodning.\n\ +For at beholde disse tegn, skal du klikke på Annuller og derefter vælge\n\ +en af Unicode mulighederne i Kodnings rullelisten.\n\ +Fortsæt?" }

1 0

Paul Vriens : setupapi: Update the Danish translation.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: f7db14b2fcfc909527569fc8bed3f9e8f5eda907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7db14b2fcfc909527569fc8b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 14:48:05 2010 +0200 setupapi: Update the Danish translation. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- dlls/setupapi/Da.rc | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Da.rc b/dlls/setupapi/Da.rc index 7a83816..00bb261 100644 --- a/dlls/setupapi/Da.rc +++ b/dlls/setupapi/Da.rc @@ -2,6 +2,7 @@ * Danish language support * * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk> + * 2010 Thomas Larsen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,8 +21,18 @@ #include "setupapi_private.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "Filen '%s' fra %s mangler" + IDS_UNKNOWN "Ukendt" + IDS_COPYFROM "Kopiere filer fra:" + IDS_INFO "Skriv den sti, hvor filen er placeret, og klik derefter på OK." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "Kopierer filer..." @@ -34,3 +45,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Mangler Filer" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Indsæt fabrikantens installation disk, og\nsørg derefter for at korrekte drev er valgt nedenfor", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Kopiere fabrikantens filer fra:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "OK", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Annuller", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Gennemse...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Paul Vriens : reg: Update the Danish translation and convert to UTF-8.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 9c02314d7e60f5c8476cf982fde627a581e240e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c02314d7e60f5c8476cf982f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 15:54:14 2010 +0200 reg: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- programs/reg/Da.rc | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/reg/Da.rc b/programs/reg/Da.rc index 353b94d..ccdcf4c 100644 --- a/programs/reg/Da.rc +++ b/programs/reg/Da.rc @@ -3,6 +3,7 @@ * Danish language support * * Copyright 2008 Jens Albretsen <jens(a)albretsen.dk> + * 2010 Thomas Larsen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,12 +22,19 @@ #include "reg.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE { STRING_USAGE, "Syntaksen for dette kommando er:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" - STRING_ADD_USAGE, "REG ADD n�gle_navn [/v v�rdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE n�gle_navn [/v v�rdi | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY n�gle_navn [/v v�rdi | /ve] [/s]\n" + STRING_ADD_USAGE, "REG ADD nøgle_navn [/v værdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nøgle_navn [/v værdi | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nøgle_navn [/v værdi | /ve] [/s]\n" + STRING_SUCCESS, "Operationen blev afsluttet med succes\n" + STRING_INVALID_KEY, "Fejl: Ugyldigt nøgle navn\n" + STRING_INVALID_CMDLINE, "Fejl: Ugyldige kommando linje parametre\n" + STRING_NO_REMOTE, "Fejl: Kunne ikke tilføje nøgler til fjern maskinen\n" + STRING_CANNOT_FIND, "Fejl: Systemet kunne ikke finde, den angivet registrerings nøgle eller værdi\n" }

1 0