Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[greatlrd] 16581: revert back startmenu.cpp the change are not complite for mf new logo
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

revert back startmenu.cpp the change are not complite for mf new logo Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-07-15 15:22:26 UTC (rev 16580) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-07-15 15:25:34 UTC (rev 16581) @@ -1795,14 +1795,14 @@ ClientRect clnt(_hwnd); int h = min(_logo_size.cy, clnt.bottom); - RECT rect = {0, clnt.bottom-h, _logo_size.cx, clnt.bottom}; + RECT rect = {0, 0, _logo_size.cx, clnt.bottom-h}; HBRUSH hbr = CreateSolidBrush(GetPixel(mem_dc, 0, 0)); FillRect(canvas, &rect, hbr); DeleteObject(hbr); PatBlt(canvas, _logo_size.cx, 0, 1, clnt.bottom, WHITENESS); - BitBlt(canvas, 0, clnt.bottom, _logo_size.cx, h, mem_dc, 0, clnt.bottom-h, SRCCOPY); + BitBlt(canvas, 0, clnt.bottom-h, _logo_size.cx, h, mem_dc, 0, 0, SRCCOPY); super::Paint(canvas); }

1 0

[greatlrd] 16580: update swedish .rc and rename it from sw to sv, remove the german part in swedish rc. all swedish rc should have sv,
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

update swedish .rc and rename it from sw to sv, remove the german part in swedish rc. all swedish rc should have sv, Added: trunk/reactos/subsys/system/explorer/explorer-sv.rc Deleted: trunk/reactos/subsys/system/explorer/explorer-sw.rc Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/res/logov.bmp Modified: trunk/reactos/subsys/system/explorer/res/logov16.bmp Modified: trunk/reactos/subsys/system/explorer/res/logov256.bmp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Copied: trunk/reactos/subsys/system/explorer/explorer-sv.rc (from rev 16569, trunk/reactos/subsys/system/explorer/explorer-sw.rc) --- trunk/reactos/subsys/system/explorer/explorer-sw.rc 2005-07-14 21:57:57 UTC (rev 16569) +++ trunk/reactos/subsys/system/explorer/explorer-sv.rc 2005-07-15 15:22:26 UTC (rev 16580) @@ -0,0 +1,462 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "resource.h" +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + + + +/////////////////////////////////////////////////////////////////////// ////// +// Swedish resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE) +#ifdef _WIN32 +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "&Avsluta", ID_FILE_EXIT + END + POPUP "&Visa" + BEGIN + MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR + MENUITEM "&Extrafõlt", ID_VIEW_EXTRA_BAR + MENUITEM "E&nhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&idfõlt", ID_VIEW_SIDE_BAR + MENUITEM "&Statusfõlt", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Uppdatera\tF5", ID_REFRESH + MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&F÷nster" + BEGIN + MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW + MENUITEM "Íverlappande\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + MENUITEM "Ordna &vertikalt\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT + MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE + END + POPUP "&Verktyg" + BEGIN + MENUITEM "&Alternativ", ID_TOOLS_OPTIONS + END + POPUP "&Hjõlp" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "Om &Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Om &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_WINEFILE MENU DISCARDABLE +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "&Íppna\tEnter", 101 + MENUITEM "&Flytta...\tF7", 106 + MENUITEM "&Kopiera...\tF8", 107 + MENUITEM "&I urklipp...\tF9", 118 + MENUITEM "&Ta bort\tDel", 108 + MENUITEM "&Byt namn...", 109 + MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "&Komprimera...", 119 + MENUITEM "Packa &upp...", 120 + MENUITEM SEPARATOR + MENUITEM "&K÷r...", ID_EXECUTE + MENUITEM "&Skriv ut...", 102 + MENUITEM "Associera...", 103 + MENUITEM SEPARATOR + MENUITEM "Skapa mapp...", ID_EXECUTE + MENUITEM "&S÷k...", 104 + MENUITEM "&Võlj filer...", 116 + MENUITEM SEPARATOR + MENUITEM "&Avsluta\tAlt+X", ID_FILE_EXIT + END + POPUP "&Disk" + BEGIN + MENUITEM "&Kopiera disk...", 201 + MENUITEM "&Namnge disk...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formatera disk...", 203 + MENUITEM SEPARATOR + MENUITEM "Anslut &Nõtverksenhet", 252 + MENUITEM "&Koppla ifrÕn Nõtverksenhet", 253 + MENUITEM SEPARATOR + MENUITEM "Dela ut...", 254 + MENUITEM "&Ta bort utdelning...", 255 + MENUITEM SEPARATOR + MENUITEM "&Võlj enhet...", 251 + END + POPUP "&Mappar" + BEGIN + MENUITEM "&Nõsta nivÕ\t+", 301 + MENUITEM "Ut÷ka &trõd\t*", 302 + MENUITEM "Ut÷ka &alla\tCtrl+*", 303 + MENUITEM "Kollapsa &trõd\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Markera undermappar", 505 + END + POPUP "&Visa" + BEGIN + MENUITEM "&Trõd och mapp", 413 + MENUITEM "Bara tr&õd", 411 + MENUITEM "Bara &mapp", 412 + MENUITEM SEPARATOR + MENUITEM "De&la", 414 + MENUITEM SEPARATOR + MENUITEM "&Namn", ID_VIEW_NAME + MENUITEM "&Alla Fildetaljer", ID_VIEW_ALL_ATTRIBUTES + , CHECKED + MENUITEM "&Vissa detaljer...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Sortera efter namn", 404 + MENUITEM "Sortera efter t&yp", 405 + MENUITEM "Sortera efter st&orlek", 406 + MENUITEM "Sortera efter &datum", 407 + MENUITEM SEPARATOR + MENUITEM "Sortera efter &...", 409 + END + POPUP "&Instõllningar" + BEGIN + MENUITEM "&Bekrõftelse...", 65535 + MENUITEM "&Teckensnitt...", 65535 + MENUITEM "&Konfigurera verktygsfõlt...", 65535 + MENUITEM SEPARATOR + MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Sidfõlt", ID_VIEW_SIDE_BAR + MENUITEM "St&atusfõlt", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM SEPARATOR + MENUITEM "&Symbol efter k÷rning", 65535 + MENUITEM "&Spara õndringar vid stõngning", 511 + END + POPUP "&Sõkerhet" + BEGIN + MENUITEM "&?tkomst...", 605 + MENUITEM "&Loggning...", 606 + MENUITEM "&?gare...", 607 + END + POPUP "&F÷nster" + BEGIN + MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW + MENUITEM "Íverlappande\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ + MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT + MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT + MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE + MENUITEM "&Uppdatera\tF5", ID_REFRESH + END + POPUP "&?" + BEGIN + MENUITEM "&Hjõlpavsnitt\tF1", ID_HELP + MENUITEM "Hjõlp &s÷k...\tF1", ID_HELP + MENUITEM "&Anvõnda hjõlpen\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Information om &Winefile...", ID_ABOUT_WINEFILE + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Instõllningar...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Aktivitetshanteraren...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Íppna volymkontroll", ID_TRAY_VOLUME + MENUITEM "Justera ljudinstõllningar", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Visa dolda ikoner", ID_SHOW_HIDDEN_ICONS + MENUITEM "Visa &ikonknapp", ID_SHOW_ICON_BUTTON + MENUITEM "&Konfigurera meddelanden...", ID_CONFIG_NOTIFYAREA + MENUITEM "Justera &datum och &tid...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "&Avsluta", ID_FILE_EXIT + END + POPUP "&Visa" + BEGIN + MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR + MENUITEM "&Sidfõlt", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Statusfõlt", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Uppdatera\tF5", ID_REFRESH + MENUITEM "&Fullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&Verktyg" + BEGIN + MENUITEM "&Alternativ", ID_TOOLS_OPTIONS + END + POPUP "&Hjõlp" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Om &operativsystemet...", ID_ABOUT_WINDOWS + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "K÷r" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 + CONTROL "&Kommando:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "&Som symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 3,45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&Avbryt",2,158,23,47,14 + PUSHBUTTON "&Hjõlp",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "S÷k program pÕ startmenyn" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filter:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Kontrollera poster",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Skrivbordsinstõllningar" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Võlj frÕn vilket h÷rn och Õt vilket hÕll du f÷redrar att rada upp ikonerna:", + IDC_STATIC,7,7,166,8 + CONTROL "võ. och nerÕt",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "÷vre Õt h÷.",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "÷vre Õt võ.",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "h÷. och nerÕt",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "võ. och uppÕt",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "nedre Õt h÷.",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "nedre Õt võ.",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "h÷. och uppÕt",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "sidor och ner",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "kanter",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "runt om",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Visa &versionsnummer",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Aktivitetsfõltsinstõllningar" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "visa &klockan",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "&G÷m inaktiva meddelandeikoner",ID_HIDE_INACTIVE_ICONS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&Meddelanden...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Startmenyinstõllningar" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Instõllningar f÷r meddelandeikoner" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Hjõlptext:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "&F÷nstertitel:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&Moduls÷kvõg:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Visningslõge",IDC_LABEL4,7,96,157,28 + CONTROL "v&isa",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&d÷lj",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "d÷lj a&utomatiskt",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Senast õndrad:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "visa d&olda",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Avbryt",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 188, 126 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Võlj MDI / SDI Lõge" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Võlj det grõnssnitt du f÷redrar:",IDC_STATIC,7,7,160,8 + CONTROL "&MDI (multiple document interface)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,121,10 + CONTROL "&SDI (single document interface)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,53,115,10 + LTEXT "Den hõr instõllningen kommer att gõlla som standard i alla nya explorer-f÷nster.", + IDC_STATIC,7,76,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,105,50,14,WS_GROUP + PUSHBUTTON "&Avbryt",IDCANCEL,106,105,50,14 +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "Reactos Explorer" + IDS_START "Start" + IDS_LOGOFF "Logga ut..." + IDS_SHUTDOWN "Stõng av..." + IDS_LAUNCH "K÷r..." + IDS_START_HELP "Hjõlp" + IDS_SEARCH_FILES "S÷k..." + IDS_DOCUMENTS "Dokument" + IDS_FAVORITES "Favoriter" + IDS_PROGRAMS "Program" + IDS_SETTINGS "Instõllningar" + IDS_EXPLORE "Utforska" + IDS_EMPTY "(tom)" + IDS_RECENT "Senaste dokumenten" + IDS_ADMIN "Administration" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Startmeny" + IDS_MINIMIZE_ALL "minimera alla f÷nster" + IDS_DESKTOP_NUM "Skrivbord %d" + IDS_VOLUME "Volym" + IDS_ITEMS_CUR "aktuella meddelanden" + IDS_ITEMS_CONFIGURED "konfiguration" + IDS_ITEMS_VISIBLE "synlig" + IDS_ITEMS_HIDDEN "dold" + IDS_NOTIFY_SHOW "visa" + IDS_NOTIFY_HIDE "d÷lj" + IDS_NOTIFY_AUTOHIDE "d÷lj automatiskt" + IDS_SHOW_HIDDEN_ICONS "Visa dolda ikoner" + IDS_HIDE_ICONS "D÷lj ikoner" + IDS_TERMINATE "Avsluta Explorer" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "Nõtverk" + IDS_CONNECTIONS "Nõtverksanslutningar" + IDS_DRIVES "Enheter" + IDS_SEARCH_COMPUTER "S÷k dator..." + IDS_SETTINGS_MENU "Instõllningsmeny" + IDS_CONTROL_PANEL "Kontrollpanelen" + IDS_PRINTERS "Skrivare" + IDS_BROWSE "Utforska filer" + IDS_SEARCH_PRG "S÷k program..." + IDS_ALL_USERS "Alla anvõndare\\" + IDS_SEARCH "S÷k" + IDS_ABOUT_EXPLORER "&Om Explorer..." + IDS_LAUNCH_MANY_PROGRAMS + "Du har valt fler õn ett program.\n?r du sõker pÕ att du vill ÷ppna dem alla?" + IDS_DESKTOPBAR_SETTINGS "Skrivbordsinstõllningar" + IDS_DESKTOP "Skrivbord" + IDS_TASKBAR "Aktivitetsfõlt" +END + +#endif // Swedish resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Deleted: trunk/reactos/subsys/system/explorer/explorer-sw.rc --- trunk/reactos/subsys/system/explorer/explorer-sw.rc 2005-07-15 14:50:46 UTC (rev 16579) +++ trunk/reactos/subsys/system/explorer/explorer-sw.rc 2005-07-15 15:22:26 UTC (rev 16580) @@ -1,501 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -/////////////////////////////////////////////////////////////////////// ////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "resource.h" -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -/////////////////////////////////////////////////////////////////////// ////// -#undef APSTUDIO_READONLY_SYMBOLS - -/////////////////////////////////////////////////////////////////////// ////// -// German (Germany) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -/////////////////////////////////////////////////////////////////////// ////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""resource.h""\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // German (Germany) resources -/////////////////////////////////////////////////////////////////////// ////// - - -/////////////////////////////////////////////////////////////////////// ////// -// Swedish resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE) -#ifdef _WIN32 -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT -#pragma code_page(1252) -#endif //_WIN32 - -/////////////////////////////////////////////////////////////////////// ////// -// -// Menu -// - -IDM_MDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Arkiv" - BEGIN - MENUITEM "&Avsluta", ID_FILE_EXIT - END - POPUP "&Visa" - BEGIN - MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR - MENUITEM "&Extrafõlt", ID_VIEW_EXTRA_BAR - MENUITEM "E&nhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "S&idfõlt", ID_VIEW_SIDE_BAR - MENUITEM "&Statusfõlt", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Uppdatera\tF5", ID_REFRESH - MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "SDI", ID_VIEW_SDI - END - POPUP "&F÷nster" - BEGIN - MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW - MENUITEM "Íverlappande\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ - MENUITEM "Ordna &vertikalt\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT - MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE - END - POPUP "&Verktyg" - BEGIN - MENUITEM "&Alternativ", ID_TOOLS_OPTIONS - END - POPUP "&Hjõlp" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "Om &Explorer...", ID_ABOUT_EXPLORER - MENUITEM "Om &OS...", ID_ABOUT_WINDOWS - END -END - -IDM_WINEFILE MENU DISCARDABLE -BEGIN - POPUP "&Arkiv" - BEGIN - MENUITEM "&Íppna\tEnter", 101 - MENUITEM "&Flytta...\tF7", 106 - MENUITEM "&Kopiera...\tF8", 107 - MENUITEM "&I urklipp...\tF9", 118 - MENUITEM "&Ta bort\tDel", 108 - MENUITEM "&Byt namn...", 109 - MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "&Komprimera...", 119 - MENUITEM "Packa &upp...", 120 - MENUITEM SEPARATOR - MENUITEM "&K÷r...", ID_EXECUTE - MENUITEM "&Skriv ut...", 102 - MENUITEM "Associera...", 103 - MENUITEM SEPARATOR - MENUITEM "Skapa mapp...", ID_EXECUTE - MENUITEM "&S÷k...", 104 - MENUITEM "&Võlj filer...", 116 - MENUITEM SEPARATOR - MENUITEM "&Avsluta\tAlt+X", ID_FILE_EXIT - END - POPUP "&Disk" - BEGIN - MENUITEM "&Kopiera disk...", 201 - MENUITEM "&Namnge disk...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formatera disk...", 203 - MENUITEM SEPARATOR - MENUITEM "Anslut &Nõtverksenhet", 252 - MENUITEM "&Koppla ifrÕn Nõtverksenhet", 253 - MENUITEM SEPARATOR - MENUITEM "Dela ut...", 254 - MENUITEM "&Ta bort utdelning...", 255 - MENUITEM SEPARATOR - MENUITEM "&Võlj enhet...", 251 - END - POPUP "&Mappar" - BEGIN - MENUITEM "&Nõsta nivÕ\t+", 301 - MENUITEM "Ut÷ka &trõd\t*", 302 - MENUITEM "Ut÷ka &alla\tCtrl+*", 303 - MENUITEM "Kollapsa &trõd\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Markera undermappar", 505 - END - POPUP "&Visa" - BEGIN - MENUITEM "&Trõd och mapp", 413 - MENUITEM "Bara tr&õd", 411 - MENUITEM "Bara &mapp", 412 - MENUITEM SEPARATOR - MENUITEM "De&la", 414 - MENUITEM SEPARATOR - MENUITEM "&Namn", ID_VIEW_NAME - MENUITEM "&Alla Fildetaljer", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "&Vissa detaljer...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Sortera efter namn", 404 - MENUITEM "Sortera efter t&yp", 405 - MENUITEM "Sortera efter st&orlek", 406 - MENUITEM "Sortera efter &datum", 407 - MENUITEM SEPARATOR - MENUITEM "Sortera efter &...", 409 - END - POPUP "&Instõllningar" - BEGIN - MENUITEM "&Bekrõftelse...", 65535 - MENUITEM "&Teckensnitt...", 65535 - MENUITEM "&Konfigurera verktygsfõlt...", 65535 - MENUITEM SEPARATOR - MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Enhetsfõlt", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Sidfõlt", ID_VIEW_SIDE_BAR - MENUITEM "St&atusfõlt", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "F&ullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM SEPARATOR - MENUITEM "&Symbol efter k÷rning", 65535 - MENUITEM "&Spara õndringar vid stõngning", 511 - END - POPUP "&Sõkerhet" - BEGIN - MENUITEM "&?tkomst...", 605 - MENUITEM "&Loggning...", 606 - MENUITEM "&?gare...", 607 - END - POPUP "&F÷nster" - BEGIN - MENUITEM "Nytt &f÷nster", ID_WINDOW_NEW - MENUITEM "Íverlappande\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Ordna &horizontellt", ID_WINDOW_TILE_HORZ - MENUITEM "Ordna &vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Ordna automatiskt", ID_WINDOW_AUTOSORT - MENUITEM "Ordna &symboler", ID_WINDOW_ARRANGE - MENUITEM "&Uppdatera\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "&Hjõlpavsnitt\tF1", ID_HELP - MENUITEM "Hjõlp &s÷k...\tF1", ID_HELP - MENUITEM "&Anvõnda hjõlpen\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Information om &Winefile...", ID_ABOUT_WINEFILE - END -END - -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Instõllningar...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Aktivitetshanteraren...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Íppna volymkontroll", ID_TRAY_VOLUME - MENUITEM "Justera ljudinstõllningar", ID_VOLUME_PROPERTIES - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Visa dolda ikoner", ID_SHOW_HIDDEN_ICONS - MENUITEM "Visa &ikonknapp", ID_SHOW_ICON_BUTTON - MENUITEM "&Konfigurera meddelanden...", ID_CONFIG_NOTIFYAREA - MENUITEM "Justera &datum och &tid...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_SDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Arkiv" - BEGIN - MENUITEM "&Avsluta", ID_FILE_EXIT - END - POPUP "&Visa" - BEGIN - MENUITEM "&Verktygsfõlt", ID_VIEW_TOOL_BAR - MENUITEM "&Sidfõlt", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "&Statusfõlt", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Uppdatera\tF5", ID_REFRESH - MENUITEM "&Fullskõrm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&MDI", ID_VIEW_MDI - END - POPUP "&Verktyg" - BEGIN - MENUITEM "&Alternativ", ID_TOOLS_OPTIONS - END - POPUP "&Hjõlp" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER - MENUITEM "Om &operativsystemet...", ID_ABOUT_WINDOWS - END -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// Dialog -// - -IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "K÷r" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,162,10 - CONTROL "&Kommando:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, - 18,60,10 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "&Som symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 3,45,71,12 - DEFPUSHBUTTON "&OK",1,158,6,47,14 - PUSHBUTTON "&Avbryt",2,158,23,47,14 - PUSHBUTTON "&Hjõlp",254,158,43,47,14 -END - -IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "S÷k program pÕ startmenyn" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - LTEXT "&Filter:",IDC_STATIC,7,9,18,8 - EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL - CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | - WS_TABSTOP,7,25,186,33 - PUSHBUTTON "&Kontrollera poster",IDC_CHECK_ENTRIES,143,7,50,14 -END - -IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Skrivbordsinstõllningar" -FONT 8, "MS Sans Serif" -BEGIN - LTEXT "Võlj frÕn vilket h÷rn och Õt vilket hÕll du f÷redrar att rada upp ikonerna:", - IDC_STATIC,7,7,166,8 - CONTROL "võ. och nerÕt",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "÷vre Õt h÷.",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "÷vre Õt võ.",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "h÷. och nerÕt",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "võ. och uppÕt",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "nedre Õt h÷.",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "nedre Õt võ.",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "h÷. och uppÕt",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "sidor och ner",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "kanter",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "runt om",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,121,46,44 - CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | - WS_TABSTOP,159,121,46,44 - CONTROL "Visa &versionsnummer",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 -END - -IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Aktivitetsfõltsinstõllningar" -FONT 8, "MS Sans Serif" -BEGIN - CONTROL "visa &klockan",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,152,52,10 - CONTROL "&G÷m inaktiva meddelandeikoner",ID_HIDE_INACTIVE_ICONS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10 - PUSHBUTTON "&Meddelanden...",ID_CONFIG_NOTIFYAREA,153,173,50,14 -END - -IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Startmenyinstõllningar" -FONT 8, "MS Sans Serif" -BEGIN -END - -IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Instõllningar f÷r meddelandeikoner" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | - TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Hjõlptext:",IDC_LABEL1,7,44,40,8 - EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL - LTEXT "&F÷nstertitel:",IDC_LABEL2,7,63,44,8 - EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL - LTEXT "&Moduls÷kvõg:",IDC_LABEL3,7,81,43,8 - EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL - GROUPBOX "&Visningslõge",IDC_LABEL4,7,96,157,28 - CONTROL "v&isa",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,108,33,10 - CONTROL "&d÷lj",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, - 108,29,10 - CONTROL "d÷lj a&utomatiskt",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,112,108,43,10 - ICON "",IDC_PICTURE,173,101,21,20 - LTEXT "&Senast õndrad:",IDC_LABEL6,7,132,43,8 - EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | - ES_READONLY - CONTROL "visa d&olda",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 - DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP - PUSHBUTTON "&Avbryt",IDCANCEL,151,153,50,14 -END - -IDD_MDI_SDI DIALOGEX 0, 0, 188, 126 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Võlj MDI / SDI Lõge" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - LTEXT "Võlj det grõnssnitt du f÷redrar:",IDC_STATIC,7,7,160,8 - CONTROL "&MDI (multiple document interface)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,121,10 - CONTROL "&SDI (single document interface)",IDC_SDI,"Button", - BS_AUTORADIOBUTTON,7,53,115,10 - LTEXT "Den hõr instõllningen kommer att gõlla som standard i alla nya explorer-f÷nster.", - IDC_STATIC,7,76,174,22 - DEFPUSHBUTTON "&OK",IDOK,29,105,50,14,WS_GROUP - PUSHBUTTON "&Avbryt",IDCANCEL,106,105,50,14 -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TITLE "Reactos Explorer" - IDS_START "Start" - IDS_LOGOFF "Logga ut..." - IDS_SHUTDOWN "Stõng av..." - IDS_LAUNCH "K÷r..." - IDS_START_HELP "Hjõlp" - IDS_SEARCH_FILES "S÷k..." - IDS_DOCUMENTS "Dokument" - IDS_FAVORITES "Favoriter" - IDS_PROGRAMS "Program" - IDS_SETTINGS "Instõllningar" - IDS_EXPLORE "Utforska" - IDS_EMPTY "(tom)" - IDS_RECENT "Senaste dokumenten" - IDS_ADMIN "Administration" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Startmeny" - IDS_MINIMIZE_ALL "minimera alla f÷nster" - IDS_DESKTOP_NUM "Skrivbord %d" - IDS_VOLUME "Volym" - IDS_ITEMS_CUR "aktuella meddelanden" - IDS_ITEMS_CONFIGURED "konfiguration" - IDS_ITEMS_VISIBLE "synlig" - IDS_ITEMS_HIDDEN "dold" - IDS_NOTIFY_SHOW "visa" - IDS_NOTIFY_HIDE "d÷lj" - IDS_NOTIFY_AUTOHIDE "d÷lj automatiskt" - IDS_SHOW_HIDDEN_ICONS "Visa dolda ikoner" - IDS_HIDE_ICONS "D÷lj ikoner" - IDS_TERMINATE "Logga ut" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NETWORK "Nõtverk" - IDS_CONNECTIONS "Nõtverksanslutningar" - IDS_DRIVES "Enheter" - IDS_SEARCH_COMPUTER "S÷k dator..." - IDS_SETTINGS_MENU "Instõllningsmeny" - IDS_CONTROL_PANEL "Kontrollpanelen" - IDS_PRINTERS "Skrivare" - IDS_BROWSE "Utforska filer" - IDS_SEARCH_PRG "S÷k program..." - IDS_ALL_USERS "Alla anvõndare\\" - IDS_SEARCH "S÷k" - IDS_ABOUT_EXPLORER "&Om Explorer..." - IDS_LAUNCH_MANY_PROGRAMS - "Du har valt fler õn ett program.\n?r du sõker pÕ att du vill ÷ppna dem alla?" - IDS_DESKTOPBAR_SETTINGS "Skrivbordsinstõllningar" - IDS_DESKTOP "Skrivbord" - IDS_TASKBAR "Aktivitetsfõlt" -END - -#endif // Swedish resources -/////////////////////////////////////////////////////////////////////// ////// - - - -#ifndef APSTUDIO_INVOKED -/////////////////////////////////////////////////////////////////////// ////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -/////////////////////////////////////////////////////////////////////// ////// -#endif // not APSTUDIO_INVOKED - _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-07-15 14:50:46 UTC (rev 16579) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-07-15 15:22:26 UTC (rev 16580) @@ -104,7 +104,7 @@ "#include ""explorer-en.rc""\r\n" "#include ""explorer-de.rc""\r\n" "#include ""explorer-es.rc""\r\n" - "#include ""explorer-sw.rc""\r\n" + "#include ""explorer-sv.rc""\r\n" "#include ""explorer-pt.rc""\r\n" "#include ""explorer-cz.rc""\r\n" "#include ""explorer-ro.rc""\r\n" @@ -187,7 +187,7 @@ #include "explorer-de.rc" #include "explorer-es.rc" #include "explorer-fr.rc" -#include "explorer-sw.rc" +#include "explorer-sv.rc" #include "explorer-pt.rc" #include "explorer-cz.rc" #include "explorer-ro.rc" _____ Modified: trunk/reactos/subsys/system/explorer/res/logov.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/logov16.bmp (Binary files differ) [truncated at 1001 lines; 24 more skipped]

1 0

[greatlrd] 16579: Forget set some error level and some msg that should have goto ConOut not to ConErr so pipe are working with thuse msg
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

Forget set some error level and some msg that should have goto ConOut not to ConErr so pipe are working with thuse msg Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-07-15 14:40:47 UTC (rev 16578) +++ trunk/reactos/subsys/system/cmd/console.c 2005-07-15 14:50:46 UTC (rev 16579) @@ -349,13 +349,13 @@ va_end (arg_ptr); if(ret > 0) { - ConErrPuts (text); + ConOutPuts (text); LocalFree(text); } else { LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg); + ConOutPrintf(szMsg); } } _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 14:40:47 UTC (rev 16578) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 14:50:46 UTC (rev 16579) @@ -146,6 +146,7 @@ { CloseHandle (hFileSrc); error_path_not_found (); + nErrorLevel = 1; return 0; } buffer = (LPBYTE)malloc (BUFF_SIZE); @@ -154,6 +155,7 @@ CloseHandle (hFileDest); CloseHandle (hFileSrc); error_out_of_memory (); + nErrorLevel = 1; return 0; } @@ -434,6 +436,7 @@ { /* there is too many file names in command */ error_too_many_parameters(""); + nErrorLevel = 1; return 1; } @@ -607,6 +610,7 @@ { ConOutFormatMessage (GetLastError(), szSrcPath); freep (arg); + nErrorLevel = 1; return 1; } @@ -624,6 +628,7 @@ { ConOutFormatMessage (GetLastError (), szSrcPath); freep (arg); + nErrorLevel = 1; return 1; } /* Copy over the destination path name */

1 0

[hbirr] 16578: Fixed a test condition in IntWaitMessage.
by hbirr＠svn.reactos.com 15 Jul '05

15 Jul '05

Fixed a test condition in IntWaitMessage. Modified: trunk/reactos/subsys/win32k/ntuser/message.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-07-15 14:29:58 UTC (rev 16577) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-07-15 14:40:47 UTC (rev 16578) @@ -887,7 +887,7 @@ /* Nothing found. Wait for new messages. */ Status = MsqWaitForNewMessages(ThreadQueue, Wnd, MsgFilterMin, MsgFilterMax); } - while ((STATUS_WAIT_0 <= Status && Status <= STATUS_WAIT_63) || STATUS_TIMEOUT == Status); + while ((STATUS_WAIT_0 >= Status && Status <= STATUS_WAIT_63) || STATUS_TIMEOUT == Status); SetLastNtError(Status);

1 0

[hbirr] 16577: Returned STATUS_NOT_IMPLEMENTED for requests other than read or write.
by hbirr＠svn.reactos.com 15 Jul '05

15 Jul '05

Returned STATUS_NOT_IMPLEMENTED for requests other than read or write. Modified: trunk/reactos/drivers/dd/null/null.c _____ Modified: trunk/reactos/drivers/dd/null/null.c --- trunk/reactos/drivers/dd/null/null.c 2005-07-15 14:18:45 UTC (rev 16576) +++ trunk/reactos/drivers/dd/null/null.c 2005-07-15 14:29:58 UTC (rev 16577) @@ -93,15 +93,17 @@ break; default: - Irp->IoStatus.Information = 0; - nErrCode = STATUS_NOT_IMPLEMENTED; + ASSERT(FALSE); + } break; } default: - ASSERT(FALSE); + Irp->IoStatus.Information = 0; + nErrCode = STATUS_NOT_IMPLEMENTED; + } Irp->IoStatus.Status = nErrCode;

1 0

[greatlrd] 16576: fix a bug from me in COPYCMD check code it was two /V
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

fix a bug from me in COPYCMD check code it was two /V it should only have been one /N = short file name (dos 8.3 file mname not /S) Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 14:12:48 UTC (rev 16575) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 14:18:45 UTC (rev 16576) @@ -315,7 +315,7 @@ evar[t+1]=_T(' '); } - else if (_tcsncicmp(_T("/V"),&evar[t],2)==0) + else if (_tcsncicmp(_T("/N"),&evar[t],2)==0) { dwFlags |= COPY_SHORTNAME; evar[t]=_T(' ');

1 0

[greatlrd] 16575: fix errorlevel for copy. left to do is /D = copy encrypte file and decypte to destinations (NT3.51) /S = make destfile name 8.3 compatible (NT3.51) /Z = restart copy if it fails
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

fix errorlevel for copy. left to do is /D = copy encrypte file and decypte to destinations (NT3.51) /S = make destfile name 8.3 compatible (NT3.51) /Z = restart copy if it fails Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 13:51:38 UTC (rev 16574) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 14:12:48 UTC (rev 16575) @@ -72,6 +72,7 @@ { LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, source); + nErrorLevel = 1; return 0; } @@ -102,6 +103,7 @@ ConOutPrintf(szMsg, source); CloseHandle (hFileSrc); + nErrorLevel = 1; return 0; } @@ -182,6 +184,7 @@ free (buffer); CloseHandle (hFileDest); CloseHandle (hFileSrc); + nErrorLevel = 1; return 0; } } @@ -266,6 +269,8 @@ return 0; } + nErrorLevel = 0; + /* Get the envor value if it exists */ evar = malloc(512); size = GetEnvironmentVariable (_T("COPYCMD"), evar, 512); @@ -710,6 +715,7 @@ /* print out the error message */ LoadString(CMD_ModuleHandle, STRING_COPY_ERROR3, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg); + nErrorLevel = 1; } /* Loop through all wildcard files */

1 0

[greatlrd] 16574: Add environment variable COPYCMD to copy
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

Add environment variable COPYCMD to copy Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 11:46:38 UTC (rev 16573) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 13:51:38 UTC (rev 16574) @@ -254,18 +254,100 @@ TCHAR * UseThisName; /* Stores the name( i.e. blah.txt or blah*.txt) which later we might need */ TCHAR PreserveName[MAX_PATH]; + /* for CMDCOPY env */ + TCHAR *evar; + int size; - /*Show help/usage info*/ + + /*Show help/usage info*/ if (!_tcsncmp (param, _T("/?"), 2)) { ConOutResPaging(TRUE, STRING_COPY_HELP2); return 0; } - /*Split the user input into array*/ + /* Get the envor value if it exists */ + evar = malloc(512); + size = GetEnvironmentVariable (_T("COPYCMD"), evar, 512); + if (size > 512) + { + evar = realloc(evar,size * sizeof(TCHAR) ); + if (evar!=NULL) + { + size = GetEnvironmentVariable (_T("COPYCMD"), evar, size); + } + } + /* check see if we did get any env variable */ + if (size !=0) + { + int t=0; + /* scan and set the flags */ + for (t=0;t<size;t++) + { + if (_tcsncicmp(_T("/A"),&evar[t],2)==0) + { + evar[t]=_T(' '); + evar[t+1]=_T(' '); + } + + else if (_tcsncicmp(_T("/B"),&evar[t],2)==0) + { + dwFlags |= COPY_BINARY; + evar[t]=_T(' '); + evar[t+1]=_T(' '); + } + else if (_tcsncicmp(_T("/D"),&evar[t],2)==0) + { + dwFlags |= COPY_DECRYPT; + evar[t]=_T(' '); + evar[t+1]=_T(' '); + } + + else if (_tcsncicmp(_T("/V"),&evar[t],2)==0) + { + dwFlags |= COPY_VERIFY; + evar[t]=_T(' '); + evar[t+1]=_T(' '); + } + + else if (_tcsncicmp(_T("/V"),&evar[t],2)==0) + { + dwFlags |= COPY_SHORTNAME; + evar[t]=_T(' '); + evar[t+1]=_T(' '); + } + + else if (_tcsncicmp(_T("/Y"),&evar[t],2)==0) + { + dwFlags |= COPY_NO_PROMPT; + evar[t]=_T(' '); + evar[t+1]=_T(' '); + } + + else if (_tcsncicmp(_T("/-Y"),&evar[t],3)==0) + { + dwFlags |= COPY_PROMPT; + evar[t]=_T(' '); + evar[t+1]=_T(' '); + evar[t+2]=_T(' '); + } + + else if (_tcsncicmp(_T("/Z"),&evar[t],2)==0) + { + dwFlags |= COPY_PROMPT; + evar[t]=_T(' '); + evar[t+1]=_T(' '); + } + } + } + free(evar); + + + /*Split the user input into array*/ arg = split (param, &argc, FALSE); nFiles = argc; + /*Read switches and count files*/ for (i = 0; i < argc; i++) { @@ -281,7 +363,7 @@ break; case _T('B'): - dwFlags |= COPY_DECRYPT; + dwFlags |= COPY_BINARY; break; case _T('D'):

1 0

[jimtabor] 16573: Fix up WM_ENABLE ScrollBarWndProc. Looks like we can disable and enable SB Ctrls.
by jimtabor＠svn.reactos.com 15 Jul '05

15 Jul '05

Fix up WM_ENABLE ScrollBarWndProc. Looks like we can disable and enable SB Ctrls. Modified: trunk/reactos/lib/user32/controls/scrollbar.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c _____ Modified: trunk/reactos/lib/user32/controls/scrollbar.c --- trunk/reactos/lib/user32/controls/scrollbar.c 2005-07-15 02:16:12 UTC (rev 16572) +++ trunk/reactos/lib/user32/controls/scrollbar.c 2005-07-15 11:46:38 UTC (rev 16573) @@ -1275,7 +1275,7 @@ DbgPrint("ScrollBarWndProc WM_ENABLE\n"); NtUserEnableScrollBar(Wnd,SB_CTL,(wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH)); /* Refresh Scrollbars. */ - HDC hdc = GetDCEx( Wnd, 0, DCX_CACHE | SB_CTL ); + HDC hdc = GetDCEx( Wnd, 0, DCX_CACHE ); if (!hdc) return 1; IntDrawScrollBar( Wnd, hdc, SB_CTL); ReleaseDC( Wnd, hdc ); _____ Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c --- trunk/reactos/subsys/win32k/ntuser/scrollbar.c 2005-07-15 02:16:12 UTC (rev 16572) +++ trunk/reactos/subsys/win32k/ntuser/scrollbar.c 2005-07-15 11:46:38 UTC (rev 16573) @@ -641,9 +641,9 @@ if(wSBflags == SB_CTL) { - /* FIXME */ + /* FIXME Enable or Disable SB Ctrl*/ DPRINT1("Enable Scrollbar SB_CTL\n"); - InfoV = IntGetScrollbarInfoFromWindow(Window, SB_VERT); + InfoV = IntGetScrollbarInfoFromWindow(Window, SB_CTL); Chg = IntEnableScrollBar(FALSE, InfoV ,wArrows); /* Chg? Scrollbar is Refresh in user32/controls/scrollbar.c. */ IntReleaseWindowObject(Window);

1 0

[jimtabor] 16572: Fixed wParam in WM_ENABLE ScrollBarWndProc.
by jimtabor＠svn.reactos.com 15 Jul '05

15 Jul '05

Fixed wParam in WM_ENABLE ScrollBarWndProc. Modified: trunk/reactos/lib/user32/controls/scrollbar.c _____ Modified: trunk/reactos/lib/user32/controls/scrollbar.c --- trunk/reactos/lib/user32/controls/scrollbar.c 2005-07-15 01:42:22 UTC (rev 16571) +++ trunk/reactos/lib/user32/controls/scrollbar.c 2005-07-15 02:16:12 UTC (rev 16572) @@ -1273,7 +1273,7 @@ // SCROLL_RefreshScrollBar(hwnd, SB_CTL, TRUE, TRUE); // } DbgPrint("ScrollBarWndProc WM_ENABLE\n"); - NtUserEnableScrollBar(Wnd,SB_CTL,wParam); + NtUserEnableScrollBar(Wnd,SB_CTL,(wParam ? ESB_ENABLE_BOTH : ESB_DISABLE_BOTH)); /* Refresh Scrollbars. */ HDC hdc = GetDCEx( Wnd, 0, DCX_CACHE | SB_CTL ); if (!hdc) return 1;

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005