[ros-diffs] [cfinck] 28939: - Merge 28587:28928 (only the stuff from the base/shell/explorer folder) - "Restart" button and corresponding translations - Merge 28938 - German translation changes in Explorer and Shell32

Author: cfinck
Date: Sat Sep  8 15:39:46 2007
New Revision: 28939

URL: http://svn.reactos.org/svn/reactos?rev=28939&view=rev
Log:
- Merge 28587:28928 (only the stuff from the base/shell/explorer folder) -
"Restart" button and corresponding translations
- Merge 28938 - German translation changes in Explorer and Shell32

Added:
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/res/restart.ico
      - copied unchanged from r28928, trunk/reactos/base/shell/explorer/res/restart.ico
Modified:
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp
    branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h
    branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bg.rc Sat Sep  8
15:39:46 2007
@@ -330,6 +330,7 @@
     IDS_START               "Ïóñê"
     IDS_LOGOFF              "Èçõîä..."
     IDS_SHUTDOWN            "Èçêëþ÷âàíå..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Èçïúëíÿâàíå..."
     IDS_START_HELP          "Ïîìîù"
     IDS_SEARCH_FILES        "Òúðñåíå"
@@ -397,3 +398,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-bn.rc Sat Sep  8
15:39:46 2007
@@ -327,6 +327,7 @@
     IDS_START               "Kvh©Kvix ZvwjKv"
     IDS_LOGOFF              "Log Off..."
     IDS_SHUTDOWN            "eÜ Kiv..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "cwiPvjbv..."
     IDS_START_HELP          "mvnvh¨"
     IDS_SEARCH_FILES        "AbymÜvb..."
@@ -394,3 +395,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cn.rc Sat Sep  8
15:39:46 2007
@@ -330,6 +330,7 @@
     IDS_START               "¿ªÊ¼"
     IDS_LOGOFF              "×¢Ïú..."
     IDS_SHUTDOWN            "¹Ø±Õ..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "ÔËÐÐ..."
     IDS_START_HELP          "°ïÖú"
     IDS_SEARCH_FILES        "ËÑË÷..."

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-cz.rc Sat Sep  8
15:39:46 2007
@@ -330,6 +330,7 @@
     IDS_START               "Start"
     IDS_LOGOFF              "Odhlásit se..."
     IDS_SHUTDOWN            "Vypnout..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Spustit..."
     IDS_START_HELP          "Pomoc"
     IDS_SEARCH_FILES        "Hledat"
@@ -398,3 +399,4 @@
 #endif    // not APSTUDIO_INVOKED
 
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-de.rc Sat Sep  8
15:39:46 2007
@@ -336,6 +336,7 @@
     IDS_START               "Start"
     IDS_LOGOFF              "Abmelden..."
     IDS_SHUTDOWN            "Herunterfahren..."
+    IDS_RESTART             "Neu starten..."
     IDS_LAUNCH              "Ausführen..."
     IDS_START_HELP          "Hilfe"
     IDS_SEARCH_FILES        "Suche Dateien..."
@@ -403,3 +404,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-en.rc Sat Sep  8
15:39:46 2007
@@ -330,6 +330,7 @@
     IDS_START               "Start"
     IDS_LOGOFF              "Log Off..."
     IDS_SHUTDOWN            "Turn Off..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Run..."
     IDS_START_HELP          "Help"
     IDS_SEARCH_FILES        "Search..."
@@ -398,3 +399,4 @@
 #endif    // not APSTUDIO_INVOKED
 
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-es.rc Sat Sep  8
15:39:46 2007
@@ -57,7 +57,7 @@
     END
     POPUP "&Tools"
     BEGIN
-        MENUITEM "&Options",                    ID_TOOLS_OPTIONS
+        MENUITEM "&Opciones",                    ID_TOOLS_OPTIONS
     END
     POPUP "A&yuda"
     BEGIN
@@ -312,9 +312,10 @@
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_TITLE               "ReactOS Explorer"
-    IDS_START               "Iniciar"
+    IDS_START               "Inicio"
     IDS_LOGOFF              "Salir..."
     IDS_SHUTDOWN            "Apagar..."
+    IDS_RESTART             "Reiniciar..."
     IDS_LAUNCH              "Ejecutar..."
     IDS_START_HELP          "Ayuda"
     IDS_SEARCH_FILES        "Buscar..."
@@ -331,7 +332,7 @@
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_STARTMENU           "Menú Inicio"
-    IDS_MINIMIZE_ALL        "mimimizar todas las ventanas"
+    IDS_MINIMIZE_ALL        "Mimimizar todas las ventanas"
     IDS_DESKTOP_NUM         "Escritorio %d"
     IDS_VOLUME              "Volumen"
     IDS_ITEMS_CUR           "Objetos Actuales"
@@ -382,3 +383,5 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-fr.rc Sat Sep  8
15:39:46 2007
@@ -329,6 +329,7 @@
     IDS_START               "Démarrer"
     IDS_LOGOFF              "Se déconnecter..."
     IDS_SHUTDOWN            "Arrêter..."
+    IDS_RESTART             "Redémarrer..."
     IDS_LAUNCH              "Exécuter..."
     IDS_START_HELP          "Aide"
     IDS_SEARCH_FILES        "Rechercher..."
@@ -396,3 +397,5 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-gr.rc Sat Sep  8
15:39:46 2007
@@ -332,6 +332,7 @@
     IDS_START               "Ýíáñîç"
     IDS_LOGOFF              "Áðïóýíäåóç..."
     IDS_SHUTDOWN            "Ôåñìáôéóìüò..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "ÅêôÝëåóç..."
     IDS_START_HELP          "ÂïÞèåéá"
     IDS_SEARCH_FILES        "ÁíáæÞôçóç..."
@@ -399,3 +400,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-hu.rc Sat Sep  8
15:39:46 2007
@@ -330,6 +330,7 @@
     IDS_START               "Start"
     IDS_LOGOFF              "Kijelentkezés..."
     IDS_SHUTDOWN            "Kikapcsolás..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Futtatás..."
     IDS_START_HELP          "Súgó"
     IDS_SEARCH_FILES        "Keresés..."
@@ -397,3 +398,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-id.rc Sat Sep  8
15:39:46 2007
@@ -330,6 +330,7 @@
     IDS_START               "Mulai"
     IDS_LOGOFF              "Keluar..."
     IDS_SHUTDOWN            "Matikan..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Jalankan..."
     IDS_START_HELP          "Bantuan"
     IDS_SEARCH_FILES        "Cari..."
@@ -397,3 +398,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-it.rc Sat Sep  8
15:39:46 2007
@@ -294,6 +294,7 @@
     IDS_START               "Start"
     IDS_LOGOFF              "Disconnetti..."
     IDS_SHUTDOWN            "Chiudi sessione..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Esegui..."
     IDS_START_HELP          "Guida"
     IDS_SEARCH_FILES        "Cerca..."
@@ -361,3 +362,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-jp.rc Sat Sep  8
15:39:46 2007
@@ -330,6 +330,7 @@
     IDS_START               "½À°Ä"
     IDS_LOGOFF              "ƒƒOƒIƒt..."
     IDS_SHUTDOWN            "ƒVƒƒƒbƒgƒ_ƒEƒ“..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "ƒtƒ@ƒCƒ‹–¼‚ðŽw’肵‚ÄŽÀs..."
     IDS_START_HELP          "ƒwƒ‹ƒv"
     IDS_SEARCH_FILES        "ƒtƒ@ƒCƒ‹‚âƒtƒHƒ‹ƒ_..."
@@ -397,3 +398,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-nl.rc Sat Sep  8
15:39:46 2007
@@ -330,6 +330,7 @@
     IDS_START               "Start"
     IDS_LOGOFF              "Afmelden..."
     IDS_SHUTDOWN            "Uitschakelen..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Uitvoeren..."
     IDS_START_HELP          "Help"
     IDS_SEARCH_FILES        "Zoeken..."
@@ -397,3 +398,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-no.rc Sat Sep  8
15:39:46 2007
@@ -330,6 +330,7 @@
     IDS_START               "Start"
     IDS_LOGOFF              "Logg av..."
     IDS_SHUTDOWN            "Slå av..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Kjør..."
     IDS_START_HELP          "Hjelp"
     IDS_SEARCH_FILES        "Søk..."
@@ -398,3 +399,4 @@
 #endif    // not APSTUDIO_INVOKED
 
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pl.rc Sat Sep  8
15:39:46 2007
@@ -49,10 +49,10 @@
     POPUP "&Okna"
     BEGIN
         MENUITEM "Nowe &okno",                 		ID_WINDOW_NEW
-        MENUITEM "&Kaskada\tShift+F5",         		ID_WINDOW_CASCADE
+        MENUITEM "&Kaskadowo\tShift+F5",         		ID_WINDOW_CASCADE
         MENUITEM "&S¹siaduj¹co poziomo",          	ID_WINDOW_TILE_HORZ
         MENUITEM "S¹siaduj¹co &pionowo\tShift+F4",  	ID_WINDOW_TILE_VERT
-        MENUITEM "&Autorozmieszczenie",       		ID_WINDOW_AUTOSORT
+        MENUITEM "&Autorozmieszczanie",       		ID_WINDOW_AUTOSORT
         MENUITEM "Rozmieœæ wed³ug &nazwy",            	ID_WINDOW_ARRANGE
     END
     POPUP "&Narzêdzia"
@@ -62,8 +62,8 @@
     POPUP "Pomo&c"
     BEGIN
         MENUITEM "Explorer &FAQ",            		ID_EXPLORER_FAQ
-        MENUITEM "ReactOS Explorer - &Informacje",      ID_ABOUT_EXPLORER
-        MENUITEM "ReactOS - I&nformacje",               ID_ABOUT_WINDOWS
+        MENUITEM "ReactOS Explorer - &informacje",      ID_ABOUT_EXPLORER
+        MENUITEM "ReactOS - i&nformacje",               ID_ABOUT_WINDOWS
     END
 END
 
@@ -74,7 +74,7 @@
         MENUITEM "&W³aœciwoœci",               	 	ID_DESKTOPBAR_SETTINGS
         MENUITEM "Mened¿er &zadañ",           	 	ID_TASKMGR
         MENUITEM SEPARATOR
-        MENUITEM "ReactOS Explorer - &Informacje",    	ID_ABOUT_EXPLORER
+        MENUITEM "ReactOS Explorer - &informacje",    	ID_ABOUT_EXPLORER
     END
 END
 
@@ -82,7 +82,7 @@
 BEGIN
     POPUP ""
     BEGIN
-        MENUITEM "&Otwórz regulacje g³oœnoœci",  	ID_TRAY_VOLUME
+        MENUITEM "&Otwórz regulacjê g³oœnoœci",  	ID_TRAY_VOLUME
         MENUITEM "&Ustaw w³aœciwoœci audio",     	ID_VOLUME_PROPERTIES
     END
 END
@@ -96,7 +96,7 @@
         MENUITEM "&Konfiguruj powiadomienia", 		ID_CONFIG_NOTIFYAREA
         MENUITEM "Ustaw &datê/godzinê",         	ID_CONFIG_TIME
         MENUITEM SEPARATOR
-        MENUITEM "ReactOS Explorer - &Informacje",      ID_ABOUT_EXPLORER
+        MENUITEM "ReactOS Explorer - &informacje",      ID_ABOUT_EXPLORER
     END
 END
 
@@ -125,8 +125,8 @@
     POPUP "Pomo&c"
     BEGIN
         MENUITEM "Explorer &FAQ",            		ID_EXPLORER_FAQ
-        MENUITEM "ReactOS Explorer - &Informacje",      ID_ABOUT_EXPLORER
-        MENUITEM "ReactOS - I&nformacje",       	ID_ABOUT_WINDOWS
+        MENUITEM "ReactOS Explorer - &informacje",      ID_ABOUT_EXPLORER
+        MENUITEM "ReactOS - i&nformacje",       	ID_ABOUT_WINDOWS
     END
 END
 
@@ -156,7 +156,7 @@
 STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
     WS_SYSMENU | WS_THICKFRAME
 EXSTYLE WS_EX_APPWINDOW
-CAPTION "Szukaj programu w menu start"
+CAPTION "Szukaj programu w Menu Start"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     LTEXT           "&Filtry:",IDC_STATIC,7,9,18,8
@@ -279,7 +279,7 @@
 
 IDD_ABOUT_EXPLORER DIALOG DISCARDABLE  0, 0, 199, 106
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "ReactOS Explorer - &Informacje"
+CAPTION "ReactOS Explorer - &informacje"
 FONT 10, "MS Sans Serif"
 BEGIN
     LTEXT           "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11
@@ -345,7 +345,7 @@
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_STARTMENU           "Menu start"
+    IDS_STARTMENU           "Menu Start"
     IDS_MINIMIZE_ALL        "Minimalizuj wszystko"
     IDS_DESKTOP_NUM         "Pulpit %d"
     IDS_VOLUME              "G³oœnoœæ"
@@ -358,7 +358,7 @@
     IDS_NOTIFY_AUTOHIDE     "autoukrywanie"
     IDS_SHOW_HIDDEN_ICONS   "Poka¿ ukryte ikony"
     IDS_HIDE_ICONS          "Ukryj ikony"
-    IDS_TERMINATE           "Zakoñcz dzia³anie ROS Explorer"
+    IDS_TERMINATE           "Zakoñcz dzia³anie ReactOS Explorer"
 END
 
 STRINGTABLE DISCARDABLE 
@@ -374,7 +374,7 @@
     IDS_SEARCH_PRG          "ZnajdŸ program..."
     IDS_ALL_USERS           "Wszyscy\\"
     IDS_SEARCH              "Szukaj"
-    IDS_ABOUT_EXPLORER      "ReactOS Explorer - &Informacje"
+    IDS_ABOUT_EXPLORER      "ReactOS Explorer - &informacje"
     IDS_LAUNCH_MANY_PROGRAMS 
                             "Zaznaczy³eœ wiêcej ni¿ jeden program.\nCzy chcesz
uruchomiæ je jednoczeœnie?"
     IDS_DESKTOPBAR_SETTINGS "W³aœciwoœci pulpitu"

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-pt.rc Sat Sep  8
15:39:46 2007
@@ -98,6 +98,7 @@
     IDS_START               "Iniciar"
     IDS_LOGOFF              "Terminar sessão..."
     IDS_SHUTDOWN            "Desligar..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Executar..."
     IDS_START_HELP          "Ajuda"
     IDS_SEARCH_FILES        "Procurar..."
@@ -165,3 +166,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ro.rc Sat Sep  8
15:39:46 2007
@@ -134,6 +134,7 @@
     IDS_START               "Începe"
     IDS_LOGOFF              "Închide sesiunea ..."
     IDS_SHUTDOWN            "Oprire calculator ..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Pornire ..."
     IDS_START_HELP          "Ajutor"
     IDS_SEARCH_FILES        "Cãutare Files..."
@@ -243,3 +244,4 @@
 #endif    // not APSTUDIO_INVOKED
 
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-ru.rc Sat Sep  8
15:39:46 2007
@@ -330,6 +330,7 @@
     IDS_START               "Ïóñê"
     IDS_LOGOFF              "Âûõîä èç ñèñòåìû..."
     IDS_SHUTDOWN            "Âûêëþ÷åíèå..."
+    IDS_RESTART             "Ïåðåçàãðóçêà..."
     IDS_LAUNCH              "Âûïîëíèòü..."
     IDS_START_HELP          "Ñïðàâêà"
     IDS_SEARCH_FILES        "Ïîèñê..."
@@ -398,3 +399,5 @@
 #endif    // not APSTUDIO_INVOKED
 
 
+
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sk.rc Sat Sep  8
15:39:46 2007
@@ -340,6 +340,7 @@
     IDS_START               "Štart"
     IDS_LOGOFF              "Odhlási..."
     IDS_SHUTDOWN            "Vypnú..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Spusti..."
     IDS_START_HELP          "Pomocník"
     IDS_SEARCH_FILES        "H¾ada..."
@@ -407,3 +408,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-sv.rc Sat Sep  8
15:39:46 2007
@@ -325,6 +325,7 @@
     IDS_START               "Start"
     IDS_LOGOFF              "Logga ut..."
     IDS_SHUTDOWN            "Stäng av..."
+    IDS_RESTART             "Restart..."
     IDS_LAUNCH              "Kör..."
     IDS_START_HELP          "Hjälp"
     IDS_SEARCH_FILES        "Sök..."
@@ -392,3 +393,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer-uk.rc Sat Sep  8
15:39:46 2007
@@ -328,8 +328,9 @@
 BEGIN
     IDS_TITLE               "Ïðîâ³äíèê ReactOS"
     IDS_START               "Ïóñê"
-    IDS_LOGOFF              "Âèõ³ä ³ç ñèñòåìè..."
+    IDS_LOGOFF              "Çàâåðøåííÿ ñåàíñó..."
     IDS_SHUTDOWN            "Âèìêíåííÿ..."
+    IDS_RESTART             "Ïåðåçàâàíòàæåííÿ..."
     IDS_LAUNCH              "Âèêîíàòè..."
     IDS_START_HELP          "Äîâ³äêà"
     IDS_SEARCH_FILES        "Ïîøóê..."
@@ -397,3 +398,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer.cpp Sat Sep  8
15:39:46 2007
@@ -402,6 +402,7 @@
 	_icons[ICID_COMPUTER]	= Icon(ICID_COMPUTER,	IDI_COMPUTER,	icon_size);
 	_icons[ICID_LOGOFF] 	= Icon(ICID_LOGOFF, 	IDI_LOGOFF,		icon_size);
 	_icons[ICID_SHUTDOWN]	= Icon(ICID_SHUTDOWN,	IDI_SHUTDOWN,	icon_size);
+	_icons[ICID_RESTART]	= Icon(ICID_RESTART,	IDI_RESTART,	icon_size);
 	_icons[ICID_BOOKMARK]	= Icon(ICID_BOOKMARK,	IDI_DOT_TRANS,	icon_size);
 	_icons[ICID_MINIMIZE]	= Icon(ICID_MINIMIZE,	IDI_MINIMIZE,	icon_size);
 	_icons[ICID_CONTROLPAN] = Icon(ICID_CONTROLPAN, IDI_CONTROLPAN,	icon_size);

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc
(original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/explorer_intres.rc Sat Sep 
8 15:39:46 2007
@@ -152,6 +152,7 @@
 IDI_STARTMENU           ICON    DISCARDABLE     "res/startmenu.ico"
 IDI_LOGOFF              ICON    DISCARDABLE     "res/logoff.ico"
 IDI_SHUTDOWN            ICON    DISCARDABLE     "res/shutdown.ico"
+IDI_RESTART             ICON    DISCARDABLE     "res/restart.ico"
 IDI_ARROW               ICON    DISCARDABLE     "res/arrow.ico"
 IDI_ARROW_SELECTED      ICON    DISCARDABLE     "res/arrowsel.ico"
 IDI_APPICON             ICON    DISCARDABLE     "res/appicon.ico"
@@ -244,3 +245,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/globals.h Sat Sep  8
15:39:46 2007
@@ -81,6 +81,7 @@
 	ICID_COMPUTER,
 	ICID_LOGOFF,
     ICID_SHUTDOWN,
+    ICID_RESTART,
 	ICID_BOOKMARK,
     ICID_MINIMIZE,
     ICID_CONTROLPAN,

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h (original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/resource.h Sat Sep  8
15:39:46 2007
@@ -48,6 +48,7 @@
 #define IDS_SHOW_HIDDEN_ICONS           43
 #define IDS_HIDE_ICONS                  44
 #define IDS_TERMINATE                   45
+#define IDS_RESTART                     46
 #define IDI_REACTOS                     100
 #define IDI_EXPLORER                    101
 #define IDI_STARTMENU                   102
@@ -123,6 +124,7 @@
 #define IDI_NETCONNS                    175
 #define IDI_ADMIN                       176
 #define IDI_RECENT                      178
+#define IDI_RESTART                     179
 #define ID_VIEW_NAME                    401
 #define ID_VIEW_ALL_ATTRIBUTES          402
 #define ID_VIEW_SELECTED_ATTRIBUTES     403

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h
(original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/desktopbar.h Sat Sep
 8 15:39:46 2007
@@ -59,6 +59,7 @@
 #define	IDC_SEARCH_PROGRAM		0x1016
 #define	IDC_SEARCH				0x1017
 #define	IDC_TERMINATE			0x1018
+#define	IDC_RESTART 			0x1019
 
 #define	IDC_FIRST_MENU			0x3000
 

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp
(original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.cpp Sat
Sep  8 15:39:46 2007
@@ -1752,20 +1752,22 @@
 
 
 #ifndef __MINGW32__	// SHRestricted() missing in MinGW (as of 29.10.2003)
+	if (!g_Globals._SHRestricted || SHRestricted(REST_STARTMENULOGOFF) != 1)
+#else
+	if (IS_VALUE_NOT_ZERO(hkeyAdv, _T("StartMenuLogoff")))
+#endif
+		AddButton(ResString(IDS_LOGOFF),	ICID_LOGOFF, false, IDC_LOGOFF);
+
+#ifdef _ROS_
+		AddButton(ResString(IDS_RESTART), ICID_RESTART, false, IDC_RESTART);
+#endif
+
+#ifndef __MINGW32__	// SHRestricted() missing in MinGW (as of 29.10.2003)
 	if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCLOSE))
 #else
-	if (IS_VALUE_NOT_ZERO(hkeyAdv, _T("StartMenuLogoff")))
-#endif
-		AddButton(ResString(IDS_LOGOFF),	ICID_LOGOFF, false, IDC_LOGOFF);
-
-
-#ifndef __MINGW32__	// SHRestricted() missing in MinGW (as of 29.10.2003)
-	if (!g_Globals._SHRestricted || SHRestricted(REST_STARTMENULOGOFF) != 1)
-#else
 	if (IS_VALUE_ZERO(hkey, _T("NoClose")))
 #endif
 		AddButton(ResString(IDS_SHUTDOWN),	ICID_SHUTDOWN, false, IDC_SHUTDOWN);
-
 
 #ifndef _ROS_
 	AddButton(ResString(IDS_TERMINATE),	ICID_LOGOFF, false, IDC_TERMINATE);
@@ -1940,9 +1942,15 @@
 
 	  case IDC_SHUTDOWN:
 		CloseStartMenu(id);
-		ShowExitWindowsDialog(g_Globals._hwndDesktopBar);
-		break;
-
+		ShowExitWindowsDialog(g_Globals._hwndDesktop);
+		break;
+
+      case IDC_RESTART:
+		CloseStartMenu(id);
+        ShowRestartDialog(g_Globals._hwndDesktop, EWX_REBOOT);
+        /* An alternative way to do restart without shell32 help */
+        //launch_file(_hwnd, TEXT("shutdown.exe"), SW_HIDE,
TEXT("-r"));
+		break;
 
 	// settings menu
 
@@ -2149,6 +2157,15 @@
 		MessageBox(hwndOwner, TEXT("ExitWindowsDialog() not yet implemented in
SHELL32"), ResString(IDS_TITLE), MB_OK);
 }
 
+void StartMenuHandler::ShowRestartDialog(HWND hwndOwner, UINT flags)
+{
+	static DynamicFct<RESTARTWINDOWSDLG> RestartDlg(TEXT("SHELL32"), 59);
+
+	if (RestartDlg)
+		(*RestartDlg)(hwndOwner, (LPWSTR)L"You selected restart.\n\n", flags);
+	else
+		MessageBox(hwndOwner, TEXT("RestartDlg() not yet implemented in SHELL32"),
ResString(IDS_TITLE), MB_OK);
+}
 
 void SettingsMenu::AddEntries()
 {

Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h
(original)
+++ branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/taskbar/startmenu.h Sat Sep 
8 15:39:46 2007
@@ -348,6 +348,7 @@
 
 	static void	ShowLaunchDialog(HWND hwndOwner);
 	static void	ShowLogoffDialog(HWND hwndOwner);
+    static void	ShowRestartDialog(HWND hwndOwner, UINT flags);
 	static void	ShowSearchDialog();
 	static void	ShowSearchComputer();
 };

Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl…
==============================================================================
--- branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc (original)
+++ branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shell32_De.rc Sat Sep  8
15:39:46 2007
@@ -169,10 +169,10 @@
 	IDS_OVERWRITEFILE_CAPTION "Bestätigung: Datei überschreiben"
 
         /* message box strings */
-        IDS_RESTART_TITLE       "Neustarten"
-        IDS_RESTART_PROMPT      "Möchten Sie, dass ein simulierter Windows Neustart
durchgeführt wird ?"
-        IDS_SHUTDOWN_TITLE      "Anhalten"
-        IDS_SHUTDOWN_PROMPT     "Möchten Sie die aktuelle ReactOS Sitzung beenden
?"
+        IDS_RESTART_TITLE       "Neu starten"
+        IDS_RESTART_PROMPT      "Möchten Sie das System neu starten?"
+        IDS_SHUTDOWN_TITLE      "Herunterfahren"
+        IDS_SHUTDOWN_PROMPT     "Möchten Sie das System herunterfahren?"
 
         /* shell folder path default values */
 	IDS_PROGRAMS		"Startmenü\\Programme"