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

Alexandru Balut : Fix character encoding for bugzilla query results
by Alexander Nicolaysen Sørnes June 3, 2010

June 3, 2010

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 June 2, 2010

June 2, 2010

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

André Hentschel : wineps.drv: Make the Apply button useable.
by Alexandre Julliard June 2, 2010

June 2, 2010

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

Hwang YunSong : msi: Update Korean resource.
by Alexandre Julliard June 2, 2010

June 2, 2010

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

Alexandre Julliard : winex11: Fix the X image masks according to the pixmap format in Get/SetDIBits.
by Alexandre Julliard June 2, 2010

June 2, 2010

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 June 2, 2010

June 2, 2010

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

Alexandre Julliard : winex11: Ignore fontconfig and Xft configuration if the app explicitly requested antialiasing .
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: 46e231cc85c2940ef98e1f99920775505ffa9525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e231cc85c2940ef98e1f999… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 2 10:55:19 2010 +0200 winex11: Ignore fontconfig and Xft configuration if the app explicitly requested antialiasing. --- dlls/winex11.drv/xrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cca3321..810b163 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -886,7 +886,7 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) { case ANTIALIASED_QUALITY: entry->aa_default = get_antialias_type( physDev, FALSE, hinter ); - break; + return ret; /* ignore further configuration */ case CLEARTYPE_QUALITY: case CLEARTYPE_NATURAL_QUALITY: entry->aa_default = get_antialias_type( physDev, subpixel, hinter );

1 0

Frédéric Delanoy : kernel32: Fix a spelling error in French locale definitions.
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: da05cbd8ce81392b950ab00a13349dfb4293c165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da05cbd8ce81392b950ab00a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jun 1 23:59:51 2010 +0200 kernel32: Fix a spelling error in French locale definitions. --- dlls/kernel32/nls/fra.nls | 2 +- dlls/kernel32/nls/frb.nls | 2 +- dlls/kernel32/nls/frc.nls | 2 +- dlls/kernel32/nls/frl.nls | 2 +- dlls/kernel32/nls/frm.nls | 2 +- dlls/kernel32/nls/frs.nls | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/nls/fra.nls b/dlls/kernel32/nls/fra.nls index 80b34fb..9ee0137 100644 --- a/dlls/kernel32/nls/fra.nls +++ b/dlls/kernel32/nls/fra.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" } diff --git a/dlls/kernel32/nls/frb.nls b/dlls/kernel32/nls/frb.nls index caeaa76..1a0480f 100644 --- a/dlls/kernel32/nls/frb.nls +++ b/dlls/kernel32/nls/frb.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" } diff --git a/dlls/kernel32/nls/frc.nls b/dlls/kernel32/nls/frc.nls index 5b7730c..a8c07b9 100644 --- a/dlls/kernel32/nls/frc.nls +++ b/dlls/kernel32/nls/frc.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" } diff --git a/dlls/kernel32/nls/frl.nls b/dlls/kernel32/nls/frl.nls index e0610e2..bc5874c 100644 --- a/dlls/kernel32/nls/frl.nls +++ b/dlls/kernel32/nls/frl.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" } diff --git a/dlls/kernel32/nls/frm.nls b/dlls/kernel32/nls/frm.nls index 511bb51..0fc0b57 100644 --- a/dlls/kernel32/nls/frm.nls +++ b/dlls/kernel32/nls/frm.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" } diff --git a/dlls/kernel32/nls/frs.nls b/dlls/kernel32/nls/frs.nls index 45f4894..6613776 100644 --- a/dlls/kernel32/nls/frs.nls +++ b/dlls/kernel32/nls/frs.nls @@ -152,5 +152,5 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamien" LGRPID_INDIC+LGRPID_RES_BASE "Indien" LGRPID_GEORGIAN+LGRPID_RES_BASE "G�orgien" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�nien" }

1 0

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

June 2, 2010

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

Jose Rostagno : mshtml: Update Spanish translation.
by Alexandre Julliard June 2, 2010

June 2, 2010

Module: wine Branch: master Commit: 0b8e214365be921b7e42670628049d82beafd83e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8e214365be921b7e4267062… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Tue Jun 1 16:22:39 2010 -0300 mshtml: Update Spanish translation. --- dlls/mshtml/Es.rc | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Es.rc b/dlls/mshtml/Es.rc index be8fe7d..590cf6a 100644 --- a/dlls/mshtml/Es.rc +++ b/dlls/mshtml/Es.rc @@ -57,3 +57,14 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Aceptar", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Anular", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Aceptar", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0