[ros-diffs] [hbelusca] 65662: Sync with trunk r65661.

Author: hbelusca
Date: Sun Dec 14 23:08:41 2014
New Revision: 65662

URL: http://svn.reactos.org/svn/reactos?rev=65662&view=rev
Log:
Sync with trunk r65661.

Modified:
    branches/condrv_restructure/   (props changed)
    branches/condrv_restructure/dll/win32/browseui/lang/de-DE.rc
    branches/condrv_restructure/dll/win32/shell32/lang/de-DE.rc
    branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c  
(props changed)
    branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c   (props changed)
    branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c   (props changed)
    branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c   (props changed)

Propchange: branches/condrv_restructure/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:08:41 2014
@@ -19,4 +19,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:63104-65656
+/trunk/reactos:63104-65660

Modified: branches/condrv_restructure/dll/win32/browseui/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/br…
==============================================================================
--- branches/condrv_restructure/dll/win32/browseui/lang/de-DE.rc	[iso-8859-1] (original)
+++ branches/condrv_restructure/dll/win32/browseui/lang/de-DE.rc	[iso-8859-1] Sun Dec 14
23:08:41 2014
@@ -95,6 +95,17 @@
     END
 END
 
+IDM_TASKBAR_TOOLBARS MENUEX
+BEGIN
+	POPUP "&Symbolleisten", -1, MFT_STRING, MFS_ENABLED, 0
+	BEGIN
+		MENUITEM "&Desktop", IDM_TASKBAR_TOOLBARS_DESKTOP, MFT_STRING,
MFS_GRAYED
+		MENUITEM "Schnellstartleiste", IDM_TASKBAR_TOOLBARS_QUICKLAUNCH, MFT_STRING,
MFS_GRAYED
+		MENUITEM "", -1, MFT_SEPARATOR, MFS_ENABLED
+		MENUITEM "&Neue Symbolleiste...", IDM_TASKBAR_TOOLBARS_NEW, MFT_STRING,
MFS_GRAYED
+	END
+END
+
 /* Dialogs */
 
 IDD_CUSTOMIZETOOLBAREX DIALOGEX 0, 0, 357, 33

Modified: branches/condrv_restructure/dll/win32/shell32/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh…
==============================================================================
--- branches/condrv_restructure/dll/win32/shell32/lang/de-DE.rc	[iso-8859-1] (original)
+++ branches/condrv_restructure/dll/win32/shell32/lang/de-DE.rc	[iso-8859-1] Sun Dec 14
23:08:41 2014
@@ -39,6 +39,23 @@
         MENUITEM SEPARATOR
         MENUITEM "&Eigenschaften", FCIDM_SHVIEW_PROPERTIES
     END
+END
+
+/* menubar EDIT menu */
+MENU_003 MENU
+BEGIN
+    MENUITEM "&Rückgängig\tStrg+Z", FCIDM_SHVIEW_UNDO
+    MENUITEM SEPARATOR
+    MENUITEM "&Ausschneiden\tStrg+X", FCIDM_SHVIEW_CUT
+    MENUITEM "&Kopieren\tStrg+C", FCIDM_SHVIEW_COPY
+    MENUITEM "&Einfügen\tStrg+V", FCIDM_SHVIEW_INSERT
+    MENUITEM "Verknüp&fung Einfügen", FCIDM_SHVIEW_INSERTLINK
+    MENUITEM SEPARATOR
+    MENUITEM "In &Ordner kopieren...", FCIDM_SHVIEW_COPYTO
+    MENUITEM "In Ordner &verschieben...", FCIDM_SHVIEW_MOVETO
+    MENUITEM SEPARATOR
+    MENUITEM "Alles &markieren\tStrg+A", FCIDM_SHVIEW_SELECTALL
+    MENUITEM "Markieru&ng umkehren", FCIDM_SHVIEW_INVERTSELECTION
 END
 
 /* shellview item menu */
@@ -781,4 +798,6 @@
     IDS_BYTES_FORMAT "Bytes"
     IDS_UNKNOWN_APP "Unbekannte Anwendung"
     IDS_EXE_DESCRIPTION "Beschreibung:"
-END
+    
+    IDS_MENU_EMPTY "(Leer)"
+END

Propchange:
branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:08:41 2014
@@ -20,4 +20,4 @@

/branches/usb-bringup/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859

/branches/usb-bringup-trunk/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:54809-54998
-/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:63104-65655
+/trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c:63104-65660

Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/history.c
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:08:41 2014
@@ -20,4 +20,4 @@

/branches/usb-bringup/win32ss/user/winsrv/consrv/history.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859

/branches/usb-bringup-trunk/win32ss/user/winsrv/consrv/history.c:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup/win32ss/user/winsrv/consrv/history.c:54809-54998
-/trunk/reactos/win32ss/user/winsrv/consrv/history.c:64102-65655
+/trunk/reactos/win32ss/user/winsrv/consrv/history.c:64102-65660

Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/init.c
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:08:41 2014
@@ -20,4 +20,4 @@

/branches/usb-bringup/win32ss/user/winsrv/consrv/init.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859

/branches/usb-bringup-trunk/win32ss/user/winsrv/consrv/init.c:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup/win32ss/user/winsrv/consrv/init.c:54809-54998
-/trunk/reactos/win32ss/user/winsrv/consrv/init.c:63104-65655
+/trunk/reactos/win32ss/user/winsrv/consrv/init.c:63104-65660

Propchange: branches/condrv_restructure/win32ss/user/winsrv/consrv/popup.c
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Dec 14 23:08:41 2014
@@ -20,4 +20,4 @@

/branches/usb-bringup/win32ss/user/winsrv/consrv/popup.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859

/branches/usb-bringup-trunk/win32ss/user/winsrv/consrv/popup.c:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup/win32ss/user/winsrv/consrv/popup.c:54809-54998
-/trunk/reactos/win32ss/user/winsrv/consrv/popup.c:64102-65655
+/trunk/reactos/win32ss/user/winsrv/consrv/popup.c:64102-65660