[janderwald] 32966: - use FriendlyTypeName key for retrieving the specialized file description - retrieve string for CLSID_ControlPanel - translate folder string in browser - fix displaying file description type - display FileExt-File for file extension w/o file description, i.e. XML-File

Author: janderwald
Date: Mon Apr 14 15:55:14 2008
New Revision: 32966

URL: http://svn.reactos.org/svn/reactos?rev=32966&view=rev
Log:
- use FriendlyTypeName key for retrieving the specialized file description
- retrieve string for CLSID_ControlPanel
- translate folder string in browser
- fix displaying file description type
- display FileExt-File for file extension w/o file description, i.e. XML-File

Modified:
    trunk/reactos/dll/win32/shell32/classes.c
    trunk/reactos/dll/win32/shell32/lang/bg-BG.rc
    trunk/reactos/dll/win32/shell32/lang/ca-ES.rc
    trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc
    trunk/reactos/dll/win32/shell32/lang/da-DK.rc
    trunk/reactos/dll/win32/shell32/lang/de-DE.rc
    trunk/reactos/dll/win32/shell32/lang/el-GR.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/eo-EO.rc
    trunk/reactos/dll/win32/shell32/lang/es-ES.rc
    trunk/reactos/dll/win32/shell32/lang/fi-FI.rc
    trunk/reactos/dll/win32/shell32/lang/fr-FR.rc
    trunk/reactos/dll/win32/shell32/lang/hu-HU.rc
    trunk/reactos/dll/win32/shell32/lang/it-IT.rc
    trunk/reactos/dll/win32/shell32/lang/ja-JP.rc
    trunk/reactos/dll/win32/shell32/lang/ko-KO.rc
    trunk/reactos/dll/win32/shell32/lang/nb-NO.rc
    trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
    trunk/reactos/dll/win32/shell32/lang/pl-PL.rc
    trunk/reactos/dll/win32/shell32/lang/pt-BR.rc
    trunk/reactos/dll/win32/shell32/lang/pt-PT.rc
    trunk/reactos/dll/win32/shell32/lang/ru-RU.rc
    trunk/reactos/dll/win32/shell32/lang/sk-SK.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/tr-TR.rc
    trunk/reactos/dll/win32/shell32/lang/uk-UA.rc
    trunk/reactos/dll/win32/shell32/lang/wa-WA.rc
    trunk/reactos/dll/win32/shell32/lang/zh-CN.rc
    trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
    trunk/reactos/dll/win32/shell32/pidl.c
    trunk/reactos/dll/win32/shell32/shresdef.h

Modified: trunk/reactos/dll/win32/shell32/classes.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.…
==============================================================================
--- trunk/reactos/dll/win32/shell32/classes.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/classes.c [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -101,6 +101,12 @@
 
 	if (RegOpenKeyExA(HKEY_CLASSES_ROOT, szTemp, 0, KEY_READ, &hkey))
 	{
+	  return FALSE;
+	}
+
+	if (RegLoadMUIStringA(hkey, "FriendlyTypeName", szFileType, len, NULL, 0,
NULL) == ERROR_SUCCESS)
+	{
+	  RegCloseKey(hkey);
 	  return FALSE;
 	}
 
@@ -375,6 +381,12 @@
 	    if(LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_FOLDER_NAME, szDest, buflen))
 	      ret = TRUE;
 	  }
+	  else if (IsEqualIID(riid, &CLSID_ControlPanel))
+	  {
+	    if(LoadStringW(shell32_hInstance, IDS_CONTROLPANEL, szDest, buflen))
+	      ret = TRUE;
+	  }
+
 	}
 	TRACE("-- %s\n", debugstr_w(szDest));
 	return ret;

Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -665,7 +665,8 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
-
-
-
+	IDS_DIRECTORY               "Folder"
+END
+
+
+

Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-…
==============================================================================
--- 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] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -663,4 +663,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
         IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -546,13 +546,13 @@
 
 IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE |
WS_CAPTION
-CAPTION "Change Icon"
+CAPTION "Anderes Symbol"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    LTEXT "Filename:", -1, 7, 14, 208, 10
+    LTEXT "Dateiname:", -1, 7, 14, 208, 10
     PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
     EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
-    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LTEXT "Symbole:", -1, 7, 47, 208, 10
     LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS |
LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL |
WS_TABSTOP,WS_EX_STATICEDGE
     DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
     PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
@@ -660,6 +660,7 @@
 	IDS_RECYCLEBIN_LOCATION     "Papierkorbpfad"
 	IDS_RECYCLEBIN_DISKSPACE    "freier Speicher"
 	IDS_PICK_ICON_TITLE         "Choose Icon"
-	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
-	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_PICK_ICON_FILTER        "Symboldateien(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
+	IDS_OPEN_WITH_FILTER        "Programme\0*.exe\0"
+	IDS_DIRECTORY               "Dateiordner"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-…
==============================================================================
--- 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] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-…
==============================================================================
--- 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] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/eo-EO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/eo-EO.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -664,4 +664,5 @@
 	IDS_PICK_ICON_TITLE         "Seleccione un icono"
 	IDS_PICK_ICON_FILTER        "Archivos de iconos(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -666,4 +666,5 @@
 	IDS_PICK_ICON_TITLE         "Choisir une icône"
 	IDS_PICK_ICON_FILTER        "Fichiers d'icônes (*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Fichiers exécutables\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -665,4 +665,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -663,4 +663,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/nb-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/nb-NO.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-…
==============================================================================
--- 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] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -668,4 +668,5 @@
 	IDS_PICK_ICON_TITLE         "Wybierz ikonê"
 	IDS_PICK_ICON_FILTER        "Pliki ikon(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Programy\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -664,5 +664,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -664,4 +664,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -660,4 +660,5 @@
 	IDS_PICK_ICON_TITLE         "Âûáðàòü çíà÷îê"
 	IDS_PICK_ICON_FILTER        "Ôàéëû çíà÷êîâ(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -668,4 +668,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-…
==============================================================================
--- 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] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-…
==============================================================================
--- 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] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -663,4 +663,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/wa-WA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/wa-WA.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -662,4 +662,5 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
-END
+	IDS_DIRECTORY               "Folder"
+END

Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-…
==============================================================================
--- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -663,6 +663,7 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
+	IDS_DIRECTORY               "Folder"
 END
 
 #pragma code_page(default)

Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-…
==============================================================================
--- 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] Mon Apr 14 15:55:14 2008
@@ -663,6 +663,7 @@
 	IDS_PICK_ICON_TITLE         "Choose Icon"
 	IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe,
*.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 	IDS_OPEN_WITH_FILTER        "Executable Files\0*.exe\0"
+	IDS_DIRECTORY               "Folder"
 END
 
 #pragma code_page(default)

Modified: trunk/reactos/dll/win32/shell32/pidl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r…
==============================================================================
--- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -44,6 +44,7 @@
 #include "undocshell.h"
 #include "shell32_main.h"
 #include "shlwapi.h"
+#include "shresdef.h"
 
 #include "pidl.h"
 #include "wine/debug.h"
@@ -2229,24 +2230,42 @@
  */
 void _ILGetFileType(LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize)
 {
+    char sType[64];
+
     if(_ILIsValue(pidl))
     {
         char sTemp[64];
 
         if(uOutSize > 0)
             pOut[0] = 0;
-        if (_ILGetExtension (pidl, sTemp, 64))
+        if (_ILGetExtension (pidl, sType, 64))
         {
-            if (!( HCR_MapTypeToValueA(sTemp, sTemp, 64, TRUE)
-                && HCR_MapTypeToValueA(sTemp, pOut, uOutSize, FALSE )))
+            if (HCR_MapTypeToValueA(sType, sTemp, 64, TRUE))
             {
-                lstrcpynA (pOut, sTemp, uOutSize - 6);
-                strcat (pOut, "-file");
+                /* retrieve description */
+                if(HCR_MapTypeToValueA(sTemp, pOut, uOutSize, FALSE ))
+                    return;
+            }
+            /* display Ext-file as description */
+            strcpy(pOut, sType);
+            strupr(pOut);
+            /* load localized file string */
+            sTemp[0] = '\0';
+            if(LoadStringA(shell32_hInstance, IDS_SHV_COLUMN1, sTemp, 64))
+            {
+                sTemp[63] = '\0';
+                strcat(pOut, "-");
+                strcat(pOut, sTemp);
             }
         }
     }
-    else
-        lstrcpynA(pOut, "Folder", uOutSize);
+    else 
+    {
+        pOut[0] = '\0';
+        LoadStringA(shell32_hInstance, IDS_DIRECTORY, pOut, uOutSize);
+        /* make sure its null terminated */
+        pOut[uOutSize-1] = '\0';
+    }
 }
 
 /*************************************************************************

Modified: trunk/reactos/dll/win32/shell32/shresdef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef…
==============================================================================
--- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Mon Apr 14 15:55:14 2008
@@ -116,7 +116,7 @@
 #define IDS_RECYCLEBIN_LOCATION     153
 #define IDS_RECYCLEBIN_DISKSPACE    154
 #define IDS_OPEN_WITH_FILTER        155
-
+#define IDS_DIRECTORY               156
 /* Note: this string is referenced from the registry */
 #define IDS_RECYCLEBIN_FOLDER_NAME   8964