Author: rnaumann
Date: Tue Feb 23 16:06:27 2016
New Revision: 70775
URL: http://svn.reactos.org/svn/reactos?rev=70775&view=rev
Log:
[SHELL32] Fix displaying icons and some strings in the file overwrite dialog.
Patch by Jared Smudde CORE-10832
Modified:
trunk/reactos/dll/win32/shell32/lang/ca-ES.rc
trunk/reactos/dll/win32/shell32/lang/en-GB.rc
trunk/reactos/dll/win32/shell32/lang/en-US.rc
trunk/reactos/dll/win32/shell32/lang/he-IL.rc
trunk/reactos/dll/win32/shell32/lang/ko-KR.rc
trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
trunk/reactos/dll/win32/shell32/lang/sl-SI.rc
trunk/reactos/dll/win32/shell32/lang/sv-SE.rc
trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
trunk/reactos/dll/win32/shell32/shlfileop.cpp
Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-ES.rc?rev=70775&r1=70774&r2=70775&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Tue Feb 23
16:06:27 2016
@@ -694,7 +694,7 @@
IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items
to the Recycle Bin?"
IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you
want to delete it instead?"
IDS_OVERWRITEFILE_TEXT "This folder already contains a file called
'%1'.\n\nDo you want to replace it?"
- IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite"
+ IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named
'%1'.\n\nIf the files in the destination folder have the same names as files in
the\nselected folder they will be replaced. Do you still want to move or
copy\nthe folder?"
IDS_FILEOOP_COPYING "Copying..."
Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-GB.rc?rev=70775&r1=70774&r2=70775&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Tue Feb 23
16:06:27 2016
@@ -694,7 +694,7 @@
IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items
to the Recycle Bin?"
IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you
want to delete it instead?"
IDS_OVERWRITEFILE_TEXT "This folder already contains a file called
'%1'.\n\nDo you want to replace it?"
- IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite"
+ IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named
'%1'.\n\nIf the files in the destination folder have the same names as files in
the\nselected folder they will be replaced. Do you still want to move or
copy\nthe folder?"
IDS_FILEOOP_COPYING "Copying..."
Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-US.rc?rev=70775&r1=70774&r2=70775&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Tue Feb 23
16:06:27 2016
@@ -694,7 +694,7 @@
IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items
to the Recycle Bin?"
IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you
want to delete it instead?"
IDS_OVERWRITEFILE_TEXT "This folder already contains a file called
'%1'.\n\nDo you want to replace it?"
- IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite"
+ IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named
'%1'.\n\nIf the files in the destination folder have the same names as files in
the\nselected folder they will be replaced. Do you still want to move or
copy\nthe folder?"
IDS_FILEOOP_COPYING "Copying..."
Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-IL.rc?rev=70775&r1=70774&r2=70775&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Tue Feb 23
16:06:27 2016
@@ -694,7 +694,7 @@
IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items
to the Recycle Bin?"
IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you
want to delete it instead?"
IDS_OVERWRITEFILE_TEXT "This folder already contains a file called
'%1'.\n\nDo you want to replace it?"
- IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite"
+ IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named
'%1'.\n\nIf the files in the destination folder have the same names as files in
the\nselected folder they will be replaced. Do you still want to move or
copy\nthe folder?"
IDS_FILEOOP_COPYING "Copying..."
Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-KR.rc?rev=70775&r1=70774&r2=70775&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Tue Feb 23
16:06:27 2016
@@ -694,7 +694,7 @@
IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items
to the Recycle Bin?"
IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you
want to delete it instead?"
IDS_OVERWRITEFILE_TEXT "This folder already contains a file called
'%1'.\n\nDo you want to replace it?"
- IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite"
+ IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named
'%1'.\n\nIf the files in the destination folder have the same names as files in
the\nselected folder they will be replaced. Do you still want to move or
copy\nthe folder?"
IDS_FILEOOP_COPYING "Copying..."
Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-NL.rc?rev=70775&r1=70774&r2=70775&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Tue Feb 23
16:06:27 2016
@@ -694,7 +694,7 @@
IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items
to the Recycle Bin?"
IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you
want to delete it instead?"
IDS_OVERWRITEFILE_TEXT "This folder already contains a file called
'%1'.\n\nDo you want to replace it?"
- IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite"
+ IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named
'%1'.\n\nIf the files in the destination folder have the same names as files in
the\nselected folder they will be replaced. Do you still want to move or
copy\nthe folder?"
IDS_FILEOOP_COPYING "Copying..."
Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-SI.rc?rev=70775&r1=70774&r2=70775&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Tue Feb 23
16:06:27 2016
@@ -694,7 +694,7 @@
IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items
to the Recycle Bin?"
IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you
want to delete it instead?"
IDS_OVERWRITEFILE_TEXT "This folder already contains a file called
'%1'.\n\nDo you want to replace it?"
- IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite"
+ IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named
'%1'.\n\nIf the files in the destination folder have the same names as files in
the\nselected folder they will be replaced. Do you still want to move or
copy\nthe folder?"
IDS_FILEOOP_COPYING "Copying..."
Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-SE.rc?rev=70775&r1=70774&r2=70775&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Tue Feb 23
16:06:27 2016
@@ -694,7 +694,7 @@
IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items
to the Recycle Bin?"
IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you
want to delete it instead?"
IDS_OVERWRITEFILE_TEXT "This folder already contains a file called
'%1'.\n\nDo you want to replace it?"
- IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite"
+ IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named
'%1'.\n\nIf the files in the destination folder have the same names as files in
the\nselected folder they will be replaced. Do you still want to move or
copy\nthe folder?"
IDS_FILEOOP_COPYING "Copying..."
Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-TW.rc?rev=70775&r1=70774&r2=70775&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Tue Feb 23
16:06:27 2016
@@ -702,7 +702,7 @@
IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items
to the Recycle Bin?"
IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you
want to delete it instead?"
IDS_OVERWRITEFILE_TEXT "This folder already contains a file called
'%1'.\n\nDo you want to replace it?"
- IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite"
+ IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite"
IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named
'%1'.\n\nIf the files in the destination folder have the same names as files in
the\nselected folder they will be replaced. Do you still want to move or
copy\nthe folder?"
IDS_FILEOOP_COPYING "Copying..."
Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileop.cpp?rev=70775&r1=70774&r2=70775&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Tue Feb 23
16:06:27 2016
@@ -274,15 +274,13 @@
return TRUE;
case ASK_OVERWRITE_FILE:
- ids->hIconInstance = NULL;
- ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE;
+ ids->icon_resource_id = IDI_SHELL_FOLDER_MOVE2;
ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION;
ids->text_resource_id = IDS_OVERWRITEFILE_TEXT;
return TRUE;
case ASK_OVERWRITE_FOLDER:
- ids->hIconInstance = NULL;
- ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE;
+ ids->icon_resource_id = IDI_SHELL_FOLDER_MOVE2;
ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION;
ids->text_resource_id = IDS_OVERWRITEFOLDER_TEXT;
return TRUE;
