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

Alexandru Balut : Fix character encoding for bugzilla query results
by Alexander Nicolaysen Sørnes 03 Jun '10

03 Jun '10

Module: appdb Branch: master Commit: 7a70a03b567daf44d7b16fa953d4659f7fc57a25 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7a70a03b567daf44d7b16fa9… Author: Alexandru Balut <alexandru.balut(a)gmail.com> Date: Thu Jun 3 15:24:02 2010 +0200 Fix character encoding for bugzilla query results --- include/query.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/query.php b/include/query.php index 9527fb8..7b02e79 100644 --- a/include/query.php +++ b/include/query.php @@ -130,6 +130,12 @@ function query_bugzilladb($sQuery,$sComment="") $hBugzillaLink = mysql_connect(BUGZILLA_DBHOST, BUGZILLA_DBUSER, BUGZILLA_DBPASS, true); if(!$hBugzillaLink) return; mysql_select_db(BUGZILLA_DB, $hBugzillaLink); + // Tell MySQL to return UTF8-encoded results + $sQueryAskingForUtf8Results = "SET SESSION CHARACTER_SET_RESULTS = 'utf8'"; + if (!mysql_query($sQueryAskingForUtf8Results, $hBugzillaLink)) + { + query_error($sQueryAskingForUtf8Results, "", $hBugzillaLink); + } } $hResult = mysql_query($sQuery, $hBugzillaLink);

1 0

Austin English : wine-dev: Fix broken link.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: docs Branch: master Commit: 6b5de87a1bc1558193b92aef3c950d4d727d2401 URL: http://source.winehq.org/git/docs.git/?a=commit;h=6b5de87a1bc1558193b92aef3… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 1 17:54:06 2010 -0500 wine-dev: Fix broken link. --- en/winedev-debugger.sgml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 6aa9503..e4810d3 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -479,7 +479,7 @@ winedbg hl.exe -windowed <para> Disassembling win32 programs is possible using eg. <application>GoVest</> by Ansgar Trimborn. It can be found - <ulink url="http://www.geocities.com/GoVest/">here</>. + <ulink url="http://www.oocities.com/govest/">here</>. </para> <para> You can also use the newer and better @@ -834,7 +834,7 @@ winedbg myprog.exe <term> <application>GoVest</application>: <filename>govest.zip</filename> is available from - <ulink url="http://www.geocities.com/GoVest/">http://www.geocities.com/GoVest/</>. + <ulink url="http://www.oocities.com/govest/">http://www.oocities.com/govest/</>. </term> <listitem> <para>

1 0

Alexandre Julliard : winex11: Fix the X image masks according to the pixmap format in Get/SetDIBits.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 5c5c47269b599f5ec1669793e666013519ceaf1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5c47269b599f5ec1669793e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 2 15:52:20 2010 +0200 winex11: Fix the X image masks according to the pixmap format in Get/SetDIBits. --- dlls/winex11.drv/dib.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index cf58e8b..11157f1 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -71,6 +71,7 @@ typedef struct WORD depth; WORD infoBpp; WORD compression; + ColorShifts *shifts; RGBQUAD *colorMap; int nColorMap; Drawable drawable; @@ -3541,6 +3542,12 @@ static int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) wine_tsx11_unlock(); return 0; } + if (descr->shifts) + { + bmpImage->red_mask = descr->shifts->physicalRed.max << descr->shifts->physicalRed.shift; + bmpImage->green_mask = descr->shifts->physicalGreen.max << descr->shifts->physicalGreen.shift; + bmpImage->blue_mask = descr->shifts->physicalBlue.max << descr->shifts->physicalBlue.shift; + } } wine_tsx11_unlock(); @@ -3698,6 +3705,12 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) wine_tsx11_unlock(); return 0; } + if (descr->shifts) + { + bmpImage->red_mask = descr->shifts->physicalRed.max << descr->shifts->physicalRed.shift; + bmpImage->green_mask = descr->shifts->physicalGreen.max << descr->shifts->physicalGreen.shift; + bmpImage->blue_mask = descr->shifts->physicalBlue.max << descr->shifts->physicalBlue.shift; + } } #ifdef HAVE_LIBXXSHM @@ -3930,6 +3943,7 @@ INT CDECL X11DRV_SetDIBitsToDevice( X11DRV_PDEVICE *physDev, INT xDest, INT yDes descr.lines = top_down ? -lines : lines; descr.infoWidth = width; descr.depth = physDev->depth; + descr.shifts = physDev->color_shifts; descr.drawable = physDev->drawable; descr.gc = physDev->gc; descr.xSrc = xSrc; @@ -4019,6 +4033,7 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start descr.infoWidth = width; descr.lines = tmpheight >= 0 ? lines : -lines; descr.depth = physBitmap->pixmap_depth; + descr.shifts = physBitmap->trueColor ? &physBitmap->pixmap_color_shifts : NULL; descr.drawable = physBitmap->pixmap; descr.gc = get_bitmap_gc(physBitmap->pixmap_depth); descr.xSrc = 0; @@ -4175,6 +4190,7 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start descr.infoWidth = width; descr.lines = lines; descr.depth = physBitmap->pixmap_depth; + descr.shifts = physBitmap->trueColor ? &physBitmap->pixmap_color_shifts : NULL; descr.drawable = physBitmap->pixmap; descr.gc = get_bitmap_gc(physBitmap->pixmap_depth); descr.width = dib.dsBm.bmWidth; @@ -4250,6 +4266,7 @@ static void X11DRV_DIB_DoCopyDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB, descr.nColorMap = nColorMap; descr.bits = dibSection.dsBm.bmBits; descr.depth = physBitmap->pixmap_depth; + descr.shifts = physBitmap->trueColor ? &physBitmap->pixmap_color_shifts : NULL; descr.compression = dibSection.dsBmih.biCompression; descr.physBitmap = physBitmap;

1 0

Hwang YunSong : wordpad: Update Korean resource.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 75cb09fdab6be2df4bce196f5416f2ebc41f7669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cb09fdab6be2df4bce196f5… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jun 2 16:09:22 2010 +0900 wordpad: Update Korean resource. --- programs/wordpad/Ko.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 8111083..8a44194 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -242,6 +242,9 @@ BEGIN STRING_PREVIEW_PAGE, "��" STRING_PREVIEW_PAGES, "��" STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "��ġ" + STRING_UNITS_PT, "pt" END STRINGTABLE DISCARDABLE

1 0

Hwang YunSong : msi: Update Korean resource.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 761ce56643a1133200493f28467221d47b0f20f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761ce56643a1133200493f284… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jun 2 16:10:15 2010 +0900 msi: Update Korean resource. --- dlls/msi/msi_Ko.rc | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/msi/msi_Ko.rc b/dlls/msi/msi_Ko.rc index 17ab488..04efd83 100644 --- a/dlls/msi/msi_Ko.rc +++ b/dlls/msi/msi_Ko.rc @@ -1,7 +1,9 @@ /* * Korean resources for MSI * - * Copyright 2005 YunSong Hwang + * Copyright 2005 Mike McCormack + * Copyright 2010 Detlef Riekenberg + * Copyright 2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,30 +30,30 @@ STRINGTABLE DISCARDABLE 5 "%s ��θ� ã�� ϴ�" 9 "��ũ %s ��" 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ + "��:\n" \ + "msiexec �� {�ʼ� �Ű��} [�� Ű��]\n\n" \ + "��ǰ ��ġ:\n" \ "\t/i {package|productcode} [property]\n" \ "\t/package {package|productcode} [property]\n" \ "\t/a package [property]\n" \ - "Repair an installation:\n" \ + "��ġ ��:\n" \ "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ + "��ǰ ��:\n" \ "\t/uninstall {package|productcode} [property]\n" \ "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ + "��ǰ �˸��:\n" \ "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ + "��ġ �߰�:\n" \ "\t/p patchpackage [property]\n" \ "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ + "�� ɾ �� Log �� UI �� :\n" \ "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ + "MSI �� :\n" \ "\t/y\n" \ - "Unregister MSI Service:\n" \ + "MSI �� :\n" \ "\t/z\n" \ - "Display this help:\n" \ + "�� :\n" \ "\t/help\n" \ "\t/?\n" 11 "%s�� ϴ� �� Է��ϼ��"

1 0

André Hentschel : wineps.drv: Make the Apply button useable.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 9aa9a1229f2195a8b3ac575645a10242ae6e9bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa9a1229f2195a8b3ac57564… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 2 17:12:22 2010 +0200 wineps.drv: Make the Apply button useable. --- dlls/wineps.drv/driver.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 25cf0eb..b5d1e90 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -236,26 +236,27 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, if(i >= Cursel) break; i++; } - TRACE("Setting pagesize to item %d Winpage = %d\n", Cursel, - ps->WinPage); - di->dlgdm->dmPublic.u1.s1.dmPaperSize = ps->WinPage; + TRACE("Setting pagesize to item %d Winpage = %d\n", Cursel, ps->WinPage); + di->dlgdm->dmPublic.u1.s1.dmPaperSize = ps->WinPage; + SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); } break; case IDD_ORIENT_PORTRAIT: case IDD_ORIENT_LANDSCAPE: TRACE("Setting orientation to %s\n", wParam == IDD_ORIENT_PORTRAIT ? - "portrait" : "landscape"); + "portrait" : "landscape"); di->dlgdm->dmPublic.u1.s1.dmOrientation = wParam == IDD_ORIENT_PORTRAIT ? - DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE; + DMORIENT_PORTRAIT : DMORIENT_LANDSCAPE; + SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); break; case IDD_DUPLEX: if(HIWORD(wParam) == CBN_SELCHANGE) { Cursel = SendDlgItemMessageA(hwnd, LOWORD(wParam), CB_GETCURSEL, 0, 0); for(i = 0, duplex = di->pi->ppd->Duplexes; i < Cursel; i++, duplex = duplex->next) ; - TRACE("Setting duplex to item %d Winduplex = %d\n", Cursel, - duplex->WinDuplex); - di->dlgdm->dmPublic.dmDuplex = duplex->WinDuplex; + TRACE("Setting duplex to item %d Winduplex = %d\n", Cursel, duplex->WinDuplex); + di->dlgdm->dmPublic.dmDuplex = duplex->WinDuplex; + SendMessageW(GetParent(hwnd), PSM_CHANGED, 0, 0); } break; }

1 0

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

02 Jun '10

Module: wine Branch: master Commit: 39bf15400e231b430ae4de721655a0e0822f498a URL: http://source.winehq.org/git/wine.git/?a=commit;h=39bf15400e231b430ae4de721… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 23:26:53 2010 +0200 winhlp32: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- programs/winhlp32/Da.rc | 62 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 49 insertions(+), 13 deletions(-) diff --git a/programs/winhlp32/Da.rc b/programs/winhlp32/Da.rc index fc15eeb..20e3331 100644 --- a/programs/winhlp32/Da.rc +++ b/programs/winhlp32/Da.rc @@ -4,6 +4,7 @@ * Copyright 1997 Henrik Olsen * 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,12 +23,16 @@ #include "winhelp_res.h" +#pragma code_page(65001) + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + /* Menu */ -MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +MAIN_MENU MENU { POPUP "&Filer" { - MENUITEM "�&ben...", MNID_FILE_OPEN + MENUITEM "Å&ben...", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "&Udskriv emne", MNID_FILE_PRINT MENUITEM "&Indstil printer", MNID_FILE_SETUP @@ -37,9 +42,9 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT POPUP "&Rediger" { MENUITEM "K&opier...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&Anm�rk...", MNID_EDIT_ANNOTATE + MENUITEM "&Anmærk...", MNID_EDIT_ANNOTATE } - POPUP "Bog&m�rke" { + POPUP "Bog&mærke" { MENUITEM "&Definer...", MNID_BKMK_DEFINE } POPUP "&Options" { @@ -58,18 +63,18 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT END MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS } - POPUP "&Hj�lp" { - MENUITEM "&Brug af Hj�lp", MNID_HELP_HELPON - MENUITEM "Altid &�verst", MNID_HELP_HELPTOP + POPUP "&Hjælp" { + MENUITEM "&Brug af Hjælp", MNID_HELP_HELPON + MENUITEM "Altid &øverst", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Information...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "Om &WINE", MNID_HELP_WINE + MENUITEM "Om &Wine", MNID_HELP_WINE #endif } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -77,21 +82,52 @@ CAPTION "Index" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Søg" +{ + LTEXT "Er ikke blevet implementeret endnu", -1, 10, 10, 180, 150 +} + /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -STID_WINE_HELP, "WINE Hj�lp" +STID_WINE_HELP, "Wine Hjælp" STID_WHERROR, "FEJL" STID_WARNING, "ADVARSEL" STID_INFO, "Information" STID_NOT_IMPLEMENTED, "Ikke implementeret" -STID_HLPFILE_ERROR_s, "Fejl ved indl�sning af filen `%s'" +STID_HLPFILE_ERROR_s, "Fejl ved indlæsning af filen `%s'" STID_INDEX, "&Indhold" STID_CONTENTS, "Summary" STID_BACK, "&Tilbage" STID_ALL_FILES, "Alle filer (*.*)" -STID_HELP_FILES_HLP, "Hj�lpe filer (*.hlp)" +STID_HELP_FILES_HLP, "Hjælpe filer (*.hlp)" STID_FILE_NOT_FOUND_s "Kan ikke finde '%s'. Vil du selv finde filen?" STID_NO_RICHEDIT "Kan ikke finde en 'richedit' implementering... Afbryder" STID_PSH_INDEX, "Help topics: " } + +CONTEXT_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Notat...", MNID_CTXT_ANNOTATE + MENUITEM "Kopier", MNID_CTXT_COPY + MENUITEM "Udskriv...", MNID_CTXT_PRINT + POPUP "Skrifttype" + BEGIN + MENUITEM "Lille", MNID_CTXT_FONTS_SMALL + MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL + MENUITEM "Stor", MNID_CTXT_FONTS_LARGE + END + POPUP "Bevar Hjælp øverst" + BEGIN + MENUITEM "Standard", MNID_CTXT_HELP_DEFAULT + MENUITEM "Synlig", MNID_CTXT_HELP_VISIBLE + MENUITEM "Usynlig", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "Benyt systemfarver", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

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

02 Jun '10

Module: wine Branch: master Commit: 96a6e758971e0ec4764d7d6abce128c567540f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a6e758971e0ec4764d7d6ab… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 1 23:44:53 2010 +0200 wordpad: Update the Danish translation and convert to UTF-8. Translation by Thomas Larsen <sikker2004(a)yahoo.com> --- programs/wordpad/Da.rc | 86 ++++++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 39 deletions(-) diff --git a/programs/wordpad/Da.rc b/programs/wordpad/Da.rc index 882cca7..b3a8e0a 100644 --- a/programs/wordpad/Da.rc +++ b/programs/wordpad/Da.rc @@ -1,5 +1,6 @@ /* * Copyright 2008 by 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 @@ -18,6 +19,8 @@ #include "wordpad.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDM_MAINMENU MENU DISCARDABLE @@ -25,12 +28,12 @@ BEGIN POPUP "&Fil" BEGIN MENUITEM "&Ny...\tCtrl+N", ID_FILE_NEW - MENUITEM "&�ben...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Åben...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Gemme\tCtrl+S", ID_FILE_SAVE MENUITEM "Gemme &som...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Udskriv...\tCtrl+P", ID_PRINT - MENUITEM "&Forh�ndsvisning...", ID_PREVIEW + MENUITEM "&Forhåndsvisning...", ID_PREVIEW MENUITEM "&Side indstillinger...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Afslut", ID_FILE_EXIT @@ -42,20 +45,20 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Klip\tCtrl+X", ID_EDIT_CUT MENUITEM "K&opier\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Inds�t\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Indsæt\tCtrl+V", ID_EDIT_PASTE MENUITEM "&Fjern\tDEL", ID_EDIT_CLEAR MENUITEM "&Marker alt\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&S�g efter...\tCtrl+F", ID_FIND - MENUITEM "S�g efter &n�ste\tF3", ID_FIND_NEXT + MENUITEM "&Søg efter...\tCtrl+F", ID_FIND + MENUITEM "Søg efter &næste\tF3", ID_FIND_NEXT MENUITEM "E&rstat...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "S&krivebeskyttet", ID_EDIT_READONLY - MENUITEM "�&ndret", ID_EDIT_MODIFIED + MENUITEM "Æ&ndret", ID_EDIT_MODIFIED MENUITEM SEPARATOR POPUP "&Ekstra" BEGIN - MENUITEM "&Information om markeret omr�de", ID_EDIT_SELECTIONINFO + MENUITEM "&Information om markeret område", ID_EDIT_SELECTIONINFO MENUITEM "Tegn&format", ID_EDIT_CHARFORMAT MENUITEM "Stan&dard tegnformat", ID_EDIT_DEFCHARFORMAT MENUITEM "&Afsnitsformat", ID_EDIT_PARAFORMAT @@ -64,14 +67,14 @@ BEGIN END POPUP "&Vis" BEGIN - MENUITEM "V�rk&t�jslinie", ID_TOGGLE_TOOLBAR + MENUITEM "Værk&tøjslinie", ID_TOGGLE_TOOLBAR MENUITEM "&Formatteringlinie", ID_TOGGLE_FORMATBAR MENUITEM "&Lineal", ID_TOGGLE_RULER MENUITEM "&Statuslinie", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR MENUITEM "&Alternativer...", ID_VIEWPROPERTIES END - POPUP "&Inds�t" + POPUP "&Indsæt" BEGIN MENUITEM "&Dato og tid...", ID_DATETIME END @@ -87,7 +90,7 @@ BEGIN MENUITEM "&Huskeseddel\tCtrl+2", ID_BACK_2 END END - POPUP "&Hj�lp" + POPUP "&Hjælp" BEGIN MENUITEM "&Om Wine Wordpad" ID_ABOUT END @@ -99,7 +102,7 @@ BEGIN BEGIN MENUITEM "&Klip" ID_EDIT_CUT MENUITEM "K&opier" ID_EDIT_COPY - MENUITEM "&Inds�t" ID_EDIT_PASTE + MENUITEM "&Indsæt" ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Bullets" ID_BULLET MENUITEM "&Afsnit..." ID_PARAFORMAT @@ -111,18 +114,18 @@ BEGIN POPUP "" BEGIN MENUITEM "Sort", ID_COLOR_BLACK - MENUITEM "M�rker�d", ID_COLOR_MAROON - MENUITEM "Gr�n", ID_COLOR_GREEN + MENUITEM "Mørkerød", ID_COLOR_MAROON + MENUITEM "Grøn", ID_COLOR_GREEN MENUITEM "Oliven" ID_COLOR_OLIVE MENUITEM "Navy" ID_COLOR_NAVY MENUITEM "Lilla" ID_COLOR_PURPLE MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gr�" ID_COLOR_GRAY - MENUITEM "S�lv" ID_COLOR_SILVER - MENUITEM "R�d" ID_COLOR_RED + MENUITEM "Grå" ID_COLOR_GRAY + MENUITEM "Sølv" ID_COLOR_SILVER + MENUITEM "Rød" ID_COLOR_RED MENUITEM "Lime" ID_COLOR_LIME MENUITEM "Gul" ID_COLOR_YELLOW - MENUITEM "Bl�" ID_COLOR_BLUE + MENUITEM "Blå" ID_COLOR_BLUE MENUITEM "Violet" ID_COLOR_FUCHSIA MENUITEM "Cyan" ID_COLOR_AQUA MENUITEM "Hvid" ID_COLOR_WHITE @@ -135,7 +138,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Dato og tid" FONT 10, "MS Sans Serif" BEGIN - LTEXT "Tilg�ngelige formater",-1,3,2,100,15 + LTEXT "Tilgængelige formater",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY PUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Annuller",IDCANCEL,87,26,40,12 @@ -160,9 +163,9 @@ BEGIN GROUPBOX "Indryk", -1, 10, 10, 120, 68 LTEXT "Venstre", -1, 15, 22, 40, 13 EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 - LTEXT "H�jre", -1, 15, 40, 40, 13 + LTEXT "Højre", -1, 15, 40, 40, 13 EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 - LTEXT "F�rste linie", -1, 15, 58, 40, 13 + LTEXT "Første linie", -1, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Justering", -1, 15, 87, 40, 13 COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST @@ -177,7 +180,7 @@ FONT 8, "MS SHell DLg" BEGIN GROUPBOX "Tabulatorstop", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE - DEFPUSHBUTTON "&Tilf�j", ID_TAB_ADD, 20, 80, 45, 15 + DEFPUSHBUTTON "&Tilføj", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "&Fjern", ID_TAB_DEL, 72, 80, 45, 15 PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15 @@ -193,8 +196,8 @@ BEGIN RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Bryd tekst efter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Bryd tekst efter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15 - GROUPBOX "V�rkt�jslinier", -1, 150, 10, 120, 85 - CHECKBOX "&V�rkt�jslinie", IDC_PAGEFMT_TB, 160, 20, 80, 15 + GROUPBOX "Værktøjslinier", -1, 150, 10, 120, 85 + CHECKBOX "&Værktøjslinie", IDC_PAGEFMT_TB, 160, 20, 80, 15 CHECKBOX "&Formatteringlinie", IDC_PAGEFMT_FB, 160, 38, 80, 15 CHECKBOX "&Lineal", IDC_PAGEFMT_RU, 160, 56, 80, 15 CHECKBOX "&Statuslinie", IDC_PAGEFMT_SB, 160, 74, 80, 15 @@ -219,7 +222,7 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_ALIGN_LEFT, "Venstrestillet" - STRING_ALIGN_RIGHT, "H�jrestillet" + STRING_ALIGN_RIGHT, "Højrestillet" STRING_ALIGN_CENTER, "Midterstillet" END @@ -238,31 +241,36 @@ END STRINGTABLE DISCARDABLE BEGIN STRING_PREVIEW_PRINT, "Udskriv" - STRING_PREVIEW_NEXTPAGE, "N�ste side" + STRING_PREVIEW_NEXTPAGE, "Næste side" STRING_PREVIEW_PREVPAGE, "Forrige side" STRING_PREVIEW_TWOPAGES, "To sider" - STRING_PREVIEW_ONEPAGE, "�n side" + STRING_PREVIEW_ONEPAGE, "Én side" STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Luk" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" + STRING_PREVIEW_PAGE, "Side" + STRING_PREVIEW_PAGES, "Sider" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "tomme" + STRING_UNITS_INCH, "tommer" + STRING_UNITS_PT, "pkt" END STRINGTABLE DISCARDABLE BEGIN STRING_DEFAULT_FILENAME, "Dokument" - STRING_PROMPT_SAVE_CHANGES, "Gemme �ndringer i �%s�?" - STRING_SEARCH_FINISHED, "F�rdig med at s�ge i dokumentet." - STRING_LOAD_RICHED_FAILED, "Kunne ikke indl�se RichEdit-biblioteket." + STRING_PROMPT_SAVE_CHANGES, "Gemme ændringer i «%s»?" + STRING_SEARCH_FINISHED, "Færdig med at søge i dokumentet." + STRING_LOAD_RICHED_FAILED, "Kunne ikke indlæse RichEdit-biblioteket." STRING_SAVE_LOSEFORMATTING, "Du har valgt at gemme i rent tekstformat, noget som " \ - "vil medf�re at al formatering g�r tabt. Er du " \ - "sikker p� at du vil forts�tte?" + "vil medføre at al formatering går tabt. Er du " \ + "sikker på at du vil fortsætte?" STRING_INVALID_NUMBER, "Ugyldigt talformat" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage dokumenter er ikke underst�ttet" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage dokumenter er ikke understøttet" + STRING_WRITE_FAILED, "Kunne ikke gemme filen." + STRING_WRITE_ACCESS_DENIED, "Filen kunne ikke gemmes, adgang nægtet." + STRING_OPEN_FAILED, "Kunne ikke åbne filen." + STRING_OPEN_ACCESS_DENIED, "Filen kunne ikke åbnes, adgang nægtet." + STRING_PRINTING_NOT_IMPLEMENTED, "Udskrivning er endnu ikke implementeret." + STRING_MAX_TAB_STOPS, "Kan ikke tilføje mere end 32 tabulatorer." END

1 0

Sven Baars : progman: Fix Dutch translation.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 624dd8456098628cdf63206c3db861c9b77d912d URL: http://source.winehq.org/git/wine.git/?a=commit;h=624dd8456098628cdf63206c3… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jun 1 21:27:58 2010 +0200 progman: Fix Dutch translation. --- programs/progman/Nl.rc | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/progman/Nl.rc b/programs/progman/Nl.rc index c0c78a3..a575fe6 100644 --- a/programs/progman/Nl.rc +++ b/programs/progman/Nl.rc @@ -22,6 +22,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + /* Menu */ MAIN_MENU MENU @@ -30,7 +32,7 @@ MAIN_MENU MENU MENUITEM "&Nieuw...", PM_NEW MENUITEM "&Openen\tEnter", PM_OPEN MENUITEM "Ve&rplaatsen...\tF7", PM_MOVE, GRAYED - MENUITEM "&Kopi�ren...\tF8", PM_COPY, GRAYED + MENUITEM "&Kopiëren...\tF8", PM_COPY, GRAYED MENUITEM "&Verwijderen\tEntf", PM_DELETE MENUITEM "&Eigenschappen...\tAlt+Enter", PM_ATTRIBUTES MENUITEM SEPARATOR @@ -50,7 +52,7 @@ MAIN_MENU MENU } POPUP "&Help" { - MENUITEM "Help-&onderwerpen", PM_CONTENTS + MENUITEM "Help-onder&werpen", PM_CONTENTS MENUITEM "&Zoeken...", PM_SEARCH MENUITEM SEPARATOR MENUITEM "&Hulp bij Help", PM_HELPONHELP @@ -96,9 +98,9 @@ PUSHBUTTON "&Help", PM_HELP, 185, 45, 60, 15, WS_TA DIALOG_COPY DIALOG 0, 0, 250, 65 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Programma kopi�ren" +CAPTION "Programma kopiëren" { -LTEXT "Kopi�er programma:", -1, 5, 5, 90, 15 +LTEXT "Kopiëer programma:", -1, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15 LTEXT "Van programmagroep:", -1, 5, 13, 90, 15 LTEXT "", PM_FROM_GROUP, 95, 13, 90, 15 @@ -117,7 +119,7 @@ CAPTION "Eigenschappen van de programmagroep" { LTEXT "B&eschrijving:", PM_DESCRIPTION_TXT, 05, 18, 50, 10 EDITTEXT PM_DESCRIPTION, 60, 18, 90, 15, WS_TABSTOP -LTEXT "&Groepbestand:", PM_FILE_TXT, 05, 38, 50, 10 +LTEXT "&Groepsbestand:", PM_FILE_TXT, 05, 38, 50, 10 EDITTEXT PM_FILE, 60, 38, 90, 15, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 155, 5, 60, 15, WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 155, 25, 60, 15, WS_TABSTOP @@ -192,7 +194,7 @@ IDS_INFO, "Informatie" IDS_DELETE, "Verwijderen" IDS_DELETE_GROUP_s, "Wilt u groep `%s' verwijderen?" IDS_DELETE_PROGRAM_s, "Wilt u programma `%s' verwijderen?" -IDS_NOT_IMPLEMENTED, "Niet ge�mplementeerd" +IDS_NOT_IMPLEMENTED, "Niet geïmplementeerd" IDS_FILE_READ_ERROR_s, "Fout bij het lezen van `%s'." IDS_FILE_WRITE_ERROR_s, "Fout bij het schrijven van `%s'." IDS_GRPFILE_READ_ERROR_s, "\

1 0

Konstantin Kondratyuk : mshtml: Fix typo in Russian resources.
by Alexandre Julliard 02 Jun '10

02 Jun '10

Module: wine Branch: master Commit: 437cf862f9369f2c8955a617f89c0ff9f47b22a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437cf862f9369f2c8955a617f… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Tue Jun 1 22:08:51 2010 +0400 mshtml: Fix typo in Russian resources. --- dlls/mshtml/Ru.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Ru.rc b/dlls/mshtml/Ru.rc index 6722ddc..c3fede1 100644 --- a/dlls/mshtml/Ru.rc +++ b/dlls/mshtml/Ru.rc @@ -36,7 +36,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Установка Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Wine не может найти пакет Gecko, который необходим для корректной работы приложений"\ + LTEXT "Wine не может найти пакет Gecko, который необходим для корректной работы приложений "\ "с поддержкой HTML. " \ "Wine может автоматически загрузить и установить его для вас.\n\n" \ "Примечание: рекомендуется использовать пакет, предоставляемый вашим дистрибутивом. "\

1 0