[ros-diffs] [hbelusca] 66119: Sync with trunk r66118.

Author: hbelusca
Date: Fri Jan 30 00:47:13 2015
New Revision: 66119

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

Modified:
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/   (props changed)
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hiveinst.inf
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/bg-BG.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ca-ES.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/cs-CZ.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/da-DK.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/de-DE.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/el-GR.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/en-GB.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/en-US.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/es-ES.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/fi-FI.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/fr-FR.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/he-IL.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/hu-HU.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/it-IT.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ja-JP.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ko-KR.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/nl-NL.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/no-NO.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pl-PL.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pt-BR.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pt-PT.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ro-RO.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ru-RU.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sk-SK.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sl-SI.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sq-AL.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sv-SE.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/tr-TR.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/uk-UA.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/zh-CN.rc
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/zh-TW.rc
    branches/ReactOS-0.3.17-FOSDEM2015/rosapps/   (props changed)

Propchange: branches/ReactOS-0.3.17-FOSDEM2015/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Fri Jan 30 00:47:13 2015
@@ -20,4 +20,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:66079-66111
+/trunk/reactos:66079-66118

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hiveinst.inf
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hiveinst.inf	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hiveinst.inf	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -11,7 +11,7 @@
 ; VBE SVGA driver
 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,16
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,32
 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,800
 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,600

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/bg-BG.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/bg-BG.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ca-ES.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ca-ES.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ca-ES.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/cs-CZ.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/cs-CZ.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/cs-CZ.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -634,7 +634,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/da-DK.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/da-DK.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/da-DK.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -634,7 +634,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/de-DE.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/de-DE.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Warnung"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "Diese Datei wird entweder durch das Betriebssystem oder durch\n\
 eine andere Anwendung verwendet. Diese Datei zu verändern kann Ihr System beschädigen\n\
 oder die Funktion beeinträchtigen.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/el-GR.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/el-GR.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/en-GB.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/en-GB.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/en-GB.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/en-US.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/en-US.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/es-ES.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/es-ES.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -629,7 +629,7 @@
 CAPTION "Advertencia"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "Ester archivo podría pertenecer al sistema operativo o\n\
 alguna otra aplicación. Modificar este archivo podría dañar el\n\
 sistema o comprometer su correcto funcionamiento.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/fi-FI.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/fi-FI.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/fi-FI.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/fr-FR.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/fr-FR.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Attention"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "Ce fichier peut être utilisé par le système ou par\n\
 une autre application. Modifier ce fichier peut endommager votre\n\
 système ou le rendre moins fonctionnel.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/he-IL.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/he-IL.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/he-IL.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/hu-HU.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/hu-HU.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/hu-HU.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/it-IT.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/it-IT.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ja-JP.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ja-JP.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ja-JP.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 9, "MS UI Gothic"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ko-KR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ko-KR.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ko-KR.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/nl-NL.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/nl-NL.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/nl-NL.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/no-NO.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/no-NO.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/no-NO.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pl-PL.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pl-PL.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pt-BR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pt-BR.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pt-BR.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pt-PT.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pt-PT.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/pt-PT.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ro-RO.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ro-RO.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ro-RO.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -630,7 +630,7 @@
 CAPTION "Atenție"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "Acest fișier ar putea să fie folosit fie de către sistemul de\n\
 operare sau de o oarecare aplicație. Modificând acest fișier\n\
 riscați să cauzați daune în sistem.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ru-RU.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/ru-RU.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -630,7 +630,7 @@
 CAPTION "Предупреждение"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "Этот файл может быть использован операционной системой\n\
 или другим приложением. Изменение этого файла может повредить\n\
 систему или сделать ее менее функциональной.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sk-SK.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sk-SK.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sl-SI.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sl-SI.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sl-SI.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sq-AL.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sq-AL.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sq-AL.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -632,7 +632,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sv-SE.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sv-SE.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/sv-SE.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/tr-TR.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/tr-TR.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/tr-TR.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/uk-UA.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/uk-UA.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -628,7 +628,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/zh-CN.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/zh-CN.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -637,7 +637,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/zh-TW.rc
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/reacto...
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/zh-TW.rc	[iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/dll/win32/shell32/lang/zh-TW.rc	[iso-8859-1] Fri Jan 30 00:47:13 2015
@@ -636,7 +636,7 @@
 CAPTION "Caution"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20
+    ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20
     LTEXT "This file could either be used by the operating system or by\n\
 another application. Modifying this file might damage your\n\
 system or make it less functional.\n\n\

Propchange: branches/ReactOS-0.3.17-FOSDEM2015/rosapps/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Fri Jan 30 00:47:13 2015
@@ -1 +1 @@
-/trunk/rosapps:66079-66111
+/trunk/rosapps:66079-66118