December 2008 - Wine-Commits

Michael Stefaniuc : winedos: Don't cast zero.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 63ce2ac3dc8e32f0830d085c34501a8bd46c938f URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ce2ac3dc8e32f0830d085c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 8 04:07:14 2008 +0100 winedos: Don't cast zero. --- dlls/winedos/int21.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 33032d4..b8a1163 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -3877,9 +3877,9 @@ static unsigned INT21_FindHelper(LPCWSTR fullPath, unsigned drive, unsigned coun if (count) return 0; path[0] = drive + 'A'; if (!GetVolumeInformationW(path, entry->cAlternateFileName, 13, NULL, NULL, NULL, NULL, 0)) return 0; - RtlSecondsSince1970ToTime( (time_t)0, (LARGE_INTEGER *)&entry->ftCreationTime ); - RtlSecondsSince1970ToTime( (time_t)0, (LARGE_INTEGER *)&entry->ftLastAccessTime ); - RtlSecondsSince1970ToTime( (time_t)0, (LARGE_INTEGER *)&entry->ftLastWriteTime ); + RtlSecondsSince1970ToTime( 0, (LARGE_INTEGER *)&entry->ftCreationTime ); + RtlSecondsSince1970ToTime( 0, (LARGE_INTEGER *)&entry->ftLastAccessTime ); + RtlSecondsSince1970ToTime( 0, (LARGE_INTEGER *)&entry->ftLastWriteTime ); entry->dwFileAttributes = FA_LABEL; entry->nFileSizeHigh = entry->nFileSizeLow = 0; TRACE("returning %s as label\n", debugstr_w(entry->cAlternateFileName));

1 0

Michael Stefaniuc : setupapi: Remove some superfluous casts.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 02d1154bab37c1cc6915c0a657189bf4153acd22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d1154bab37c1cc6915c0a65… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 8 04:06:20 2008 +0100 setupapi: Remove some superfluous casts. --- dlls/setupapi/devinst.c | 6 +++--- dlls/setupapi/diskspace.c | 2 +- dlls/setupapi/misc.c | 2 +- dlls/setupapi/parser.c | 2 +- dlls/setupapi/tests/devinst.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f134da1..1dbec9a 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -561,8 +561,8 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, devInst->data.DevInst = devInfo->devId; devInst->data.Reserved = (ULONG_PTR)devInfo; SETUPDI_GuidToString(guid, classGuidStr); - SetupDiSetDeviceRegistryPropertyW((HDEVINFO)set, - &devInst->data, SPDRP_CLASSGUID, (const BYTE *)classGuidStr, + SetupDiSetDeviceRegistryPropertyW(set, &devInst->data, + SPDRP_CLASSGUID, (const BYTE *)classGuidStr, lstrlenW(classGuidStr) * sizeof(WCHAR)); if (dev) *dev = &devInst->data; ret = TRUE; @@ -1190,7 +1190,7 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, list->cDevices = 0; list_init(&list->devices); - return (HDEVINFO)list; + return list; } /*********************************************************************** diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index 9da4e9d..e22133c 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -82,7 +82,7 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT } ptr += lstrlenW(ptr) + 1; } - return (HANDLE)list; + return list; } diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 7109be9..44a0349 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -727,7 +727,7 @@ DWORD WINAPI TakeOwnershipOfFile(LPCWSTR lpFileName) goto fail; } - pOwner = (PTOKEN_OWNER)MyMalloc(dwSize); + pOwner = MyMalloc(dwSize); if (pOwner == NULL) { CloseHandle(hToken); diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index c2bd84c..656fb78 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1158,7 +1158,7 @@ HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR class, DWORD style, UINT *err TRACE( "%s -> %p\n", debugstr_w(path), file ); file->filename = path; SetLastError( 0 ); - return (HINF)file; + return file; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 37c3acd..ada6027 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1091,7 +1091,7 @@ static void testRegisterAndGetDetail(void) "\\\\?\\root#legacy_bogus#0000#{6a55b5a4-3f65-11db-b704-0011955c2bdb}\\"; PSP_DEVICE_INTERFACE_DETAIL_DATA_A detail = NULL; - detail = (PSP_DEVICE_INTERFACE_DETAIL_DATA_A)HeapAlloc(GetProcessHeap(), 0, dwSize); + detail = HeapAlloc(GetProcessHeap(), 0, dwSize); if (detail) { detail->cbSize = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath) + sizeof(char);

1 0

Michael Stefaniuc : taskmgr: Remove some superfluous casts.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: e8992418073871e0743cbe23986387b013c28b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8992418073871e0743cbe239… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 8 04:07:58 2008 +0100 taskmgr: Remove some superfluous casts. --- programs/taskmgr/dbgchnl.c | 2 +- programs/taskmgr/graphctl.c | 2 +- programs/taskmgr/taskmgr.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 457713c..382675f 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -111,7 +111,7 @@ static int list_channel_CB(HANDLE hProcess, void* addr, struct __wine_debug_ char val[2]; LVITEMA lvitem; int index; - HWND hChannelLV = (HWND)user; + HWND hChannelLV = user; lvitem.mask = LVIF_TEXT; lvitem.pszText = channel->name; diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 8b6d98d..ea51293 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -377,7 +377,7 @@ void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc) /* to avoid flicker, establish a memory dc, draw to it */ /* and then BitBlt it to the client */ memDC = CreateCompatibleDC(dc); - memBitmap = (HBITMAP)CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); + memBitmap = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); oldBitmap = SelectObject(memDC, memBitmap); if (memDC != NULL) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 8d05ca6..8ba832e 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -753,7 +753,7 @@ LPWSTR GetLastErrorText(LPWSTR lpwszBuf, DWORD dwSize) sprintfW(lpwszBuf, wszFormat, lpwszTemp, GetLastError()); } if (lpwszTemp) { - LocalFree((HLOCAL)lpwszTemp); + LocalFree(lpwszTemp); } return lpwszBuf; }

1 0

Michael Stefaniuc : rsaenh: Do not cast zero.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 50b45a78a34f1c127fb16ee8e2a6ffd356018bec URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b45a78a34f1c127fb16ee8e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 8 04:05:53 2008 +0100 rsaenh: Do not cast zero. --- dlls/rsaenh/md2.c | 2 +- dlls/rsaenh/mpi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/md2.c b/dlls/rsaenh/md2.c index 947a359..187d114 100644 --- a/dlls/rsaenh/md2.c +++ b/dlls/rsaenh/md2.c @@ -77,7 +77,7 @@ static void md2_compress(md2_state *md2) md2->X[32+j] = md2->X[j] ^ md2->X[16+j]; } - t = (unsigned char)0; + t = 0; /* do 18 rounds */ for (j = 0; j < 18; j++) { diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 5e10ec8..e4e8ab8 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -1009,7 +1009,7 @@ mp_count_bits (const mp_int * a) /* take the last digit and count the bits in it */ q = a->dp[a->used - 1]; - while (q > ((mp_digit) 0)) { + while (q > 0) { ++r; q >>= ((mp_digit) 1); } @@ -4351,7 +4351,7 @@ s_mp_sqr (const mp_int * a, mp_int * b) u = (mp_digit)(r >> ((mp_word) DIGIT_BIT)); } /* propagate upwards */ - while (u != ((mp_digit) 0)) { + while (u != 0) { r = ((mp_word) *tmpt) + ((mp_word) u); *tmpt++ = (mp_digit) (r & ((mp_word) MP_MASK)); u = (mp_digit)(r >> ((mp_word) DIGIT_BIT));

1 0

Michael Stefaniuc : taskmgr: Replace malloc with HeapAlloc.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: f3975c5a7e710e5e702170c7bd39a620d8ae9498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3975c5a7e710e5e702170c7b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 8 04:07:31 2008 +0100 taskmgr: Replace malloc with HeapAlloc. --- programs/taskmgr/about.c | 1 - programs/taskmgr/affinity.c | 1 - programs/taskmgr/applpage.c | 20 +++++++++++--------- programs/taskmgr/column.c | 1 - programs/taskmgr/dbgchnl.c | 1 - programs/taskmgr/debug.c | 1 - programs/taskmgr/endproc.c | 1 - programs/taskmgr/graph.c | 1 - programs/taskmgr/graphctl.c | 1 - programs/taskmgr/optnmenu.c | 1 - programs/taskmgr/perfdata.c | 24 ++++++++++++------------ programs/taskmgr/perfpage.c | 1 - programs/taskmgr/priority.c | 1 - programs/taskmgr/proclist.c | 1 - programs/taskmgr/procpage.c | 1 - programs/taskmgr/run.c | 1 - programs/taskmgr/taskmgr.c | 1 - programs/taskmgr/trayicon.c | 1 - 18 files changed, 23 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3975c5a7e710e5e70217…

1 0

Austin English : shell32: Fix German translation.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 9b0cba3ff414c9989d423bf6acaabede6cf1dc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0cba3ff414c9989d423bf6a… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Dec 7 17:13:37 2008 -0600 shell32: Fix German translation. --- dlls/shell32/shell32_De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index afe7534..cb8d39f 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -250,8 +250,8 @@ STRINGTABLE IDS_RECENT "Recent" IDS_SENDTO "SendTo" IDS_STARTMENU "Startmen�" - IDS_MYMUSIC "Meine Musik" - IDS_MYVIDEO "Meine Videos" + IDS_MYMUSIC "Eigene Musik" + IDS_MYVIDEO "Eigene Videos" IDS_DESKTOPDIRECTORY "Desktop" IDS_NETHOOD "Netzwerkumgebung" IDS_TEMPLATES "Vorlagen"

1 0

Daniel Nylander : notepad: Updated Swedish translation.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 4a65cc5f1fc739e115a37c1ac6fd17d154f595a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a65cc5f1fc739e115a37c1ac… Author: Daniel Nylander <po(a)danielnylander.se> Date: Sun Dec 7 20:55:12 2008 +0100 notepad: Updated Swedish translation. --- programs/notepad/Sv.rc | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/notepad/Sv.rc b/programs/notepad/Sv.rc index b4bfed0..fdd6660 100644 --- a/programs/notepad/Sv.rc +++ b/programs/notepad/Sv.rc @@ -4,6 +4,7 @@ * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2007, 2008 Daniel Nylander <po(a)danielnylander.se> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -59,7 +60,7 @@ POPUP "&Hj MENUITEM "&S�k...", CMD_HELP_SEARCH MENUITEM "Anv�ndning &av hj�lp", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Om Anteckningar", CMD_HELP_ABOUT_NOTEPAD } } @@ -97,15 +98,15 @@ STRING_PAGESETUP_FOOTERVALUE, "Sida &p" STRING_NOTEPAD, "Anteckningar" STRING_ERROR, "FEL" -STRING_WARNING, "WARNING" +STRING_WARNING, "VARNING" STRING_INFO, "Information" STRING_UNTITLED, "(namnl�s)" STRING_ALL_FILES, "Alla filer (*.*)" -STRING_TEXT_FILES_TXT, "Textfiler (*.txt)" +STRING_TEXT_FILES_TXT, "Textfiler (*.txt)" -STRING_TOOLARGE, "Filen '%s' �r f�r stor f�r notepad.\n \ +STRING_TOOLARGE, "Filen '%s' �r f�r stor f�r Anteckningar.\n \ Anv�nd en annan redigerare." STRING_NOTEXT, "Du skrev inte in n�gon text. \ \nSkriv n�got och f�rs�k sedan igen" @@ -113,8 +114,8 @@ STRING_DOESNOTEXIST, "Filen '%s'\nfinns inte\n\n \ Vill du skapa en ny fil?" STRING_NOTSAVED, "Filen '%s'\nhar �ndrats\n\n \ Vill du spara �ndringarna?" -STRING_NOTFOUND, "'%s' hittades inte." -STRING_OUT_OF_MEMORY, "Inte tillr�ckligt med minne f�r att slutf�ra \ +STRING_NOTFOUND, "'%s' hittades inte." +STRING_OUT_OF_MEMORY, "Det finns inte tillr�ckligt med minne f�r att slutf�ra \ den h�r uppgiften.\nAvsluta ett eller flera program f�r att �ka m�ngden\nledigt \ minne."

1 0

Daniel Nylander : winecfg: Updated Swedish translation.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 1966d8edc53cfc391a5de75c8e16bad0eaf933ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1966d8edc53cfc391a5de75c8… Author: Daniel Nylander <po(a)danielnylander.se> Date: Sun Dec 7 20:52:55 2008 +0100 winecfg: Updated Swedish translation. --- programs/winecfg/Sv.rc | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index 14cea0c..49bb236 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -2,7 +2,7 @@ * WineCfg resources * Swedish Language Support * - * Copyright 2007 Daniel Nylander <po(a)danielnylander.se> + * Copyright 2007, 2008 Daniel Nylander <po(a)danielnylander.se> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -39,9 +39,9 @@ BEGIN LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 LTEXT "Detta bibliotek �r fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU Lesser General Public License, publicerad av Free Software Foundation, antingen version 2.1 eller (om du s� vill) n�gon senare version.", IDC_STATIC,119,44,124,72 - GROUPBOX " Windows Registration Information ", IDC_STATIC, 15, 110, 230, 55 - LTEXT "Owner:", IDC_STATIC, 22, 126, 40, 20 - LTEXT "Organization:", IDC_STATIC, 22, 140, 50, 20 + GROUPBOX " Registreringsinformation f�r Windows ", IDC_STATIC, 15, 110, 230, 55 + LTEXT "�gare:", IDC_STATIC, 22, 126, 40, 20 + LTEXT "Organisation:", IDC_STATIC, 22, 140, 50, 20 EDITTEXT IDC_ABT_OWNER, 75, 126, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP EDITTEXT IDC_ABT_ORG, 75, 140, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP END @@ -67,7 +67,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " F�nsterinst�llningar ",IDC_STATIC,8,4,244,84 CONTROL "Till�t DirectX-program att stoppa &musen som l�mnar dess f�nster",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 - CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 + CONTROL "Till�t f�nsterhanteraren att &dekorera f�nstren",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Till�t &f�nsterhanteraren att styra f�nstren",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "Emulera ett virtuellt skriv&bord",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 @@ -85,7 +85,7 @@ BEGIN CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP LTEXT "dpi",IDC_STATIC,235,163,10,8 - LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 + LTEXT "Denna exempeltext anv�nder 10-punkters Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -124,12 +124,12 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Enhets&mappningar ",IDC_STATIC,8,4,244,240 - LTEXT "Failed to connect to the mount manager, the drive configuration cannot be edited.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76 + LTEXT "Misslyckades med att ansluta till monteringshanteraren. Enhetskonfigurationen kan inte redigeras.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76 CONTROL "Listvy",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 PUSHBUTTON "&L�gg till...",IDC_BUTTON_ADD,15,98,37,14 PUSHBUTTON "&Ta bort",IDC_BUTTON_REMOVE,56,98,37,14 - PUSHBUTTON "Auto&detect...",IDC_BUTTON_AUTODETECT,197,98,49,14 + PUSHBUTTON "Uppt�ck aut&omatiskt...",IDC_BUTTON_AUTODETECT,197,98,49,14 /* editing drive details */ LTEXT "&S�kv�g:",IDC_STATIC_PATH,15,123,20,9 @@ -249,7 +249,7 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_DRIVE_UNKNOWN "Autodetect" + IDS_DRIVE_UNKNOWN "Uppt�ck automatiskt" IDS_DRIVE_FIXED "Lokal h�rddisk" IDS_DRIVE_REMOTE "N�tverksutdelning" IDS_DRIVE_REMOVABLE "Diskett" @@ -289,20 +289,20 @@ END STRINGTABLE DISCARDABLE BEGIN - IDC_SYSPARAMS_BUTTON "Controls Background" - IDC_SYSPARAMS_BUTTON_TEXT "Controls Text" + IDC_SYSPARAMS_BUTTON "Kontrollerar bakgrunden" + IDC_SYSPARAMS_BUTTON_TEXT "Kontrollerar text" IDC_SYSPARAMS_DESKTOP "Skrivbord" IDC_SYSPARAMS_MENU "Menybakgrund" IDC_SYSPARAMS_MENU_TEXT "Menytext" - IDC_SYSPARAMS_SCROLLBAR "Scrollbar" - IDC_SYSPARAMS_SELECTION "Selection Background" - IDC_SYSPARAMS_SELECTION_TEXT "Selection Text" - IDC_SYSPARAMS_TOOLTIP "ToolTip Background" - IDC_SYSPARAMS_TOOLTIP_TEXT "ToolTip Text" - IDC_SYSPARAMS_WINDOW "Window Background" - IDC_SYSPARAMS_WINDOW_TEXT "Window Text" - IDC_SYSPARAMS_ACTIVE_TITLE "Active Title Bar" - IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Active Title Text" - IDC_SYSPARAMS_INACTIVE_TITLE "Inactive Title Bar" - IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inactive Title Text" + IDC_SYSPARAMS_SCROLLBAR "Rullningslist" + IDC_SYSPARAMS_SELECTION "Bakgrund f�r markering" + IDC_SYSPARAMS_SELECTION_TEXT "Text f�r markering" + IDC_SYSPARAMS_TOOLTIP "Bakgrund f�r verktygstips" + IDC_SYSPARAMS_TOOLTIP_TEXT "Text f�r verktygstips" + IDC_SYSPARAMS_WINDOW "F�nsterbakgrund" + IDC_SYSPARAMS_WINDOW_TEXT "F�nstertext" + IDC_SYSPARAMS_ACTIVE_TITLE "Aktiv titellist" + IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Aktiv titellist" + IDC_SYSPARAMS_INACTIVE_TITLE "Inaktiv titellist" + IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inaktiv titellist" END

1 0

Daniel Nylander : shell32: Updated Swedish translation.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 5e88367d173509ac01e3a9a138f128362be78eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e88367d173509ac01e3a9a13… Author: Daniel Nylander <po(a)danielnylander.se> Date: Mon Dec 8 00:55:17 2008 +0100 shell32: Updated Swedish translation. --- dlls/shell32/shell32_Sv.rc | 47 ++++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/shell32/shell32_Sv.rc b/dlls/shell32/shell32_Sv.rc index 3cd7591..208ddd5 100644 --- a/dlls/shell32/shell32_Sv.rc +++ b/dlls/shell32/shell32_Sv.rc @@ -1,5 +1,6 @@ /* * Copyright 1998 Juergen Schmied + * Copyright 2008 Daniel Nylander <po(a)danielnylander.se> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,40 +26,40 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN - MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE - MENUITEM "&Open", FCIDM_SHVIEW_OPEN + MENUITEM "&V�lj" FCIDM_SHVIEW_OPEN + MENUITEM "U&tforska", FCIDM_SHVIEW_EXPLORE + MENUITEM "&�ppna", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR - MENUITEM "C&ut", FCIDM_SHVIEW_CUT - MENUITEM "&Copy", FCIDM_SHVIEW_COPY + MENUITEM "Klipp &ut", FCIDM_SHVIEW_CUT + MENUITEM "&Kopiera", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Delete", FCIDM_SHVIEW_DELETE - MENUITEM "&Rename", FCIDM_SHVIEW_RENAME + MENUITEM "Skapa &l�nk", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Ta bort", FCIDM_SHVIEW_DELETE + MENUITEM "&Byt namn", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR - MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES + MENUITEM "&Egenskaper", FCIDM_SHVIEW_PROPERTIES END END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Arkiv" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "A&vsluta", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&Visa" BEGIN - MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON - MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "St&ora ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "S&m� ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "&Hj�lp" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "&Om Kontrollpanelen...", IDM_CPANEL_ABOUT END END @@ -68,12 +69,12 @@ CAPTION "Om %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "Wine &license...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "Wine-&licens...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 - LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "K�r p� %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 LTEXT "Wine hade inte varit m�jligt utan dessa personer:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } @@ -83,7 +84,7 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv namnet p� ett program, en mapp eller ett dokument och wine kommer att �ppna det f�r dig.", 12289, 36, 11, 182, 18 + LTEXT "Skriv namnet p� ett program, en mapp eller ett dokument och Wine kommer att �ppna det f�r dig.", 12289, 36, 11, 182, 18 LTEXT "&�ppna:", 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 @@ -93,6 +94,6 @@ FONT 8, "MS Shell Dlg" STRINGTABLE { - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_NAME "Namn" + IDS_CPANEL_DESCRIPTION "Beskrivning" }

1 0

Daniel Nylander : winhlp32: Updated Swedish translation.
by Alexandre Julliard Dec. 8, 2008

Dec. 8, 2008

Module: wine Branch: master Commit: 7ac9175ebabf9b671a6dd86bc27bf03ee2b14c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac9175ebabf9b671a6dd86bc… Author: Daniel Nylander <po(a)danielnylander.se> Date: Sun Dec 7 20:54:58 2008 +0100 winhlp32: Updated Swedish translation. --- programs/winhlp32/Sv.rc | 52 +++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/programs/winhlp32/Sv.rc b/programs/winhlp32/Sv.rc index 5fdae29..3bd6c93 100644 --- a/programs/winhlp32/Sv.rc +++ b/programs/winhlp32/Sv.rc @@ -4,7 +4,7 @@ * Copyright 1996 Ulrich Schmid * Swedish language by Karl Backstr�m <karl_b(a)geocities.com> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2007 Daniel Nylander + * Copyright 2007, 2008 Daniel Nylander <po(a)danielnylander.se> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,7 +26,7 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { POPUP "&Arkiv" { - MENUITEM "&Öppna", MNID_FILE_OPEN + MENUITEM "&�ppna", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "&Skriv ut", MNID_FILE_PRINT MENUITEM "Skrivar&konfiguration...", MNID_FILE_SETUP @@ -38,32 +38,32 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL MENUITEM SEPARATOR MENUITEM "&Kommentera...", MNID_EDIT_ANNOTATE } - POPUP "&Bokmärke" { + POPUP "&Bokm�rke" { MENUITEM "&Definiera...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "A&lternativ" { + POPUP "Hj�lpen alltid synlig" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Standard", MNID_OPTS_HELP_DEFAULT + MENUITEM "Synlig", MNID_OPTS_HELP_VISIBLE + MENUITEM "Inte synlig", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Historik", MNID_OPTS_HISTORY + POPUP "Typsnitt" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Liten", MNID_OPTS_FONTS_SMALL MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Stor", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Anv�nd systemf�rger", MNID_OPTS_SYSTEM_COLORS } - POPUP "&Hjälp" { - MENUITEM "Hjälp &för hjälp", MNID_HELP_HELPON - MENUITEM "Alltid &överst", MNID_HELP_HELPTOP + POPUP "&Hj�lp" { + MENUITEM "Hj�lp &f�r hj�lp", MNID_HELP_HELPON + MENUITEM "Alltid &�verst", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Om WINE", MNID_HELP_WINE + MENUITEM "&Om Wine", MNID_HELP_WINE #endif } } @@ -71,18 +71,18 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { -STID_WINE_HELP, "WINE Hjälp" +STID_WINE_HELP, "WINE Hj�lp" STID_WHERROR, "FEL" STID_WARNING, "VARNING" STID_INFO, "Information" STID_NOT_IMPLEMENTED, "Inte implementerat" -STID_HLPFILE_ERROR_s, "Fel vid läsning av hjälpfilen `%s'" -STID_INDEX, "&Innehåll" -STID_CONTENTS, "Summary" -STID_BACK, "&Bakåt" +STID_HLPFILE_ERROR_s, "Fel vid l�sning av hj�lpfilen `%s'" +STID_INDEX, "&Inneh�ll" +STID_CONTENTS, "Sammandrag" +STID_BACK, "&Bak�t" STID_ALL_FILES, "Alla filer (*.*)" -STID_HELP_FILES_HLP, "Hjälpfiler (*.hlp)" -STID_FILE_NOT_FOUND_s "Kan inte hitta '%s'. Vill du söka efter denna fil?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_HELP_FILES_HLP, "Hj�lpfiler (*.hlp)" +STID_FILE_NOT_FOUND_s "Kan inte hitta '%s'. Vill du s�ka efter denna fil?" +STID_NO_RICHEDIT "Kan inte hitta en implementation av richedit... Avslutar" +STID_PSH_INDEX, "Hj�lprubriker: " }

1 0