diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 88959d92bcf..b1f36264d4d 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -196,54 +196,41 @@ the folder?"
         IDS_RUNDLG_BROWSE_FILTER_ALL "All files (*.*)"
 
         /* shell folder path default values */
-	IDS_PROGRAMS                "Start Menu\\Programs"
+	/* FIXME: Some will be unused until desktop.ini support is implemented */
+	IDS_PROGRAMS                "Programs"
 	IDS_PERSONAL                "My Documents"
 	IDS_FAVORITES               "Favorites"
-	IDS_STARTUP                 "Start Menu\\Programs\\StartUp"
-	IDS_RECENT                  "Recent"
-	IDS_SENDTO                  "SendTo"
+	IDS_STARTUP                 "StartUp"
 	IDS_STARTMENU               "Start Menu"
 	IDS_MYMUSIC                 "My Music"
 	IDS_MYVIDEOS                "My Videos"
 	IDS_DESKTOPDIRECTORY        "#msgctxt#directory#Desktop"
 	IDS_NETHOOD                 "NetHood"
 	IDS_TEMPLATES               "Templates"
-	IDS_APPDATA                 "Application Data"
 	IDS_PRINTHOOD               "PrintHood"
-	IDS_LOCAL_APPDATA           "Local Settings\\Application Data"
-	IDS_INTERNET_CACHE          "Local Settings\\Temporary Internet Files"
-	IDS_COOKIES                 "Cookies"
-	IDS_HISTORY                 "Local Settings\\History"
+	IDS_HISTORY                 "History"
 	IDS_PROGRAM_FILES           "Program Files"
 	IDS_PROGRAM_FILESX86        "Program Files (x86)"
 	IDS_MYPICTURES              "My Pictures"
-	IDS_PROGRAM_FILES_COMMON    "Program Files\\Common Files"
-	IDS_PROGRAM_FILES_COMMONX86 "Program Files (x86)\\Common Files"
+	IDS_COMMON_FILES            "Common Files"
 	IDS_COMMON_DOCUMENTS        "Documents"
-	IDS_ADMINTOOLS              "Start Menu\\Programs\\Administrative Tools"
+	IDS_ADMINTOOLS              "Administrative Tools"
 	IDS_COMMON_MUSIC            "Music"
 	IDS_COMMON_PICTURES         "Pictures"
 	IDS_COMMON_VIDEOS           "Videos"
-	IDS_CDBURN_AREA             "Local Settings\\Application Data\\Microsoft\\CD Burning"
 	IDS_CONTACTS                "Contacts"
 	IDS_LINKS                   "Links"
-	IDS_PHOTO_ALBUMS            "Pictures\\Slide Shows"
-	IDS_PLAYLISTS               "Music\\Playlists"
-	IDS_PUBLIC_DOWNLOADS        "Downloads"
-	IDS_PUBLIC_GAME_TASKS       "Microsoft\\Windows\\GameExplorer"
-	IDS_PUBLIC_LIBRARIES        "Microsoft\\Windows\\Libraries"
-	IDS_PUBLIC_RINGTONES        "Microsoft\\Windows\\Ringtones"
-	IDS_SAMPLE_MUSIC            "Music\\Sample Music"
-	IDS_SAMPLE_PICTURES         "Pictures\\Sample Pictures"
-	IDS_SAMPLE_PLAYLISTS        "Music\\Sample Playlists"
-	IDS_SAMPLE_VIDEOS           "Videos\\Sample Videos"
+	IDS_SLIDE_SHOWS             "Slide Shows"
+	IDS_PLAYLISTS               "Playlists"
+	IDS_SAMPLE_MUSIC            "Sample Music"
+	IDS_SAMPLE_PICTURES         "Sample Pictures"
+	IDS_SAMPLE_PLAYLISTS        "Sample Playlists"
+	IDS_SAMPLE_VIDEOS           "Sample Videos"
 	IDS_SAVED_GAMES             "Saved Games"
 	IDS_SAVED_SEARCHES          "Searches"
 	IDS_USER_PROFILES           "Users"
-	IDS_COMMON_OEM_LINKS        "OEM Links"
 	IDS_DOCUMENTS               "Documents"
 	IDS_DOWNLOADS               "Downloads"
-	IDS_LOCAL_APPDATA_LOW       "AppData\\LocalLow"
 
 	IDS_NEWFOLDER		"New Folder"
 
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 943f5c18a50..31110ac4089 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -756,6 +756,8 @@ VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int id, LPCVOID pszPath)
 static const WCHAR szCurrentVersion[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\0'};
 static const WCHAR Administrative_ToolsW[] = {'A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'};
 static const WCHAR AppDataW[] = {'A','p','p','D','a','t','a','\0'};
+static const WCHAR AppData_LocalLowW[] = {'A','p','p','D','a','t','a','\\','L','o','c','a','l','L','o','w','\0'};
+static const WCHAR Application_DataW[] = {'A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\0'};
 static const WCHAR CacheW[] = {'C','a','c','h','e','\0'};
 static const WCHAR CD_BurningW[] = {'C','D',' ','B','u','r','n','i','n','g','\0'};
 static const WCHAR Common_Administrative_ToolsW[] = {'C','o','m','m','o','n',' ','A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'};
@@ -775,27 +777,57 @@ static const WCHAR CommonVideoW[] = {'C','o','m','m','o','n','V','i','d','e','o'
 static const WCHAR ContactsW[] = {'C','o','n','t','a','c','t','s','\0'};
 static const WCHAR CookiesW[] = {'C','o','o','k','i','e','s','\0'};
 static const WCHAR DesktopW[] = {'D','e','s','k','t','o','p','\0'};
+static const WCHAR DocumentsW[] = {'D','o','c','u','m','e','n','t','s','\0'};
+static const WCHAR DownloadsW[] = {'D','o','w','n','l','o','a','d','s','\0'};
 static const WCHAR FavoritesW[] = {'F','a','v','o','r','i','t','e','s','\0'};
 static const WCHAR FontsW[] = {'F','o','n','t','s','\0'};
 static const WCHAR HistoryW[] = {'H','i','s','t','o','r','y','\0'};
+static const WCHAR LinksW[] = {'L','i','n','k','s','\0'};
 static const WCHAR Local_AppDataW[] = {'L','o','c','a','l',' ','A','p','p','D','a','t','a','\0'};
+static const WCHAR Local_Settings_Application_DataW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\0'};
+static const WCHAR Local_Settings_CD_BurningW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','A','p','p','l','i','c','a','t','i','o','n',' ','D','a','t','a','\\','M','i','c','r','o','s','o','f','t','\\','C','D',' ','B','u','r','n','i','n','g','\0'};
+static const WCHAR Local_Settings_HistoryW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','H','i','s','t','o','r','y','\0'};
+static const WCHAR Local_Settings_Temporary_Internet_FilesW[] = {'L','o','c','a','l',' ','S','e','t','t','i','n','g','s','\\','T','e','m','p','o','r','a','r','y',' ','I','n','t','e','r','n','e','t',' ','F','i','l','e','s','\0'};
+static const WCHAR Microsoft_Windows_GameExplorerW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','G','a','m','e','E','x','p','l','o','r','e','r','\0'};
+static const WCHAR Microsoft_Windows_LibrariesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','L','i','b','r','a','r','i','e','s','\0'};
+static const WCHAR Microsoft_Windows_RingtonesW[] = {'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','R','i','n','g','t','o','n','e','s','\0'};
+static const WCHAR MusicW[] = {'M','u','s','i','c','\0'};
+static const WCHAR Music_PlaylistsW[] = {'M','u','s','i','c','\\','P','l','a','y','l','i','s','t','s','\0'};
+static const WCHAR Music_Sample_MusicW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','M','u','s','i','c','\0'};
+static const WCHAR Music_Sample_PlaylistsW[] = {'M','u','s','i','c','\\','S','a','m','p','l','e',' ','P','l','a','y','l','i','s','t','s','\0'};
+static const WCHAR My_DocumentsW[] = {'M','y',' ','D','o','c','u','m','e','n','t','s','\0'};
 static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'};
 static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'};
 static const WCHAR My_VideosW[] = {'M','y',' ','V','i','d','e','o','s','\0'};
 static const WCHAR NetHoodW[] = {'N','e','t','H','o','o','d','\0'};
+static const WCHAR OEM_LinksW[] = {'O','E','M',' ','L','i','n','k','s','\0'};
 static const WCHAR PersonalW[] = {'P','e','r','s','o','n','a','l','\0'};
+static const WCHAR PicturesW[] = {'P','i','c','t','u','r','e','s','\0'};
+static const WCHAR Pictures_Sample_PicturesW[] = {'P','i','c','t','u','r','e','s','\\','S','a','m','p','l','e',' ','P','i','c','t','u','r','e','s','\0'};
+static const WCHAR Pictures_Slide_ShowsW[] = {'P','i','c','t','u','r','e','s','\\','S','l','i','d','e',' ','S','h','o','w','s','\0'};
 static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'};
+static const WCHAR Program_FilesW[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s','\0'};
+static const WCHAR Program_Files_Common_FilesW[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s','\\','C','o','m','m','o','n',' ','F','i','l','e','s','\0'};
+static const WCHAR Program_Files_x86W[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s',' ','(','x','8','6',')','\0'};
+static const WCHAR Program_Files_x86_Common_FilesW[] = {'P','r','o','g','r','a','m',' ','F','i','l','e','s',' ','(','x','8','6',')','\\','C','o','m','m','o','n',' ','F','i','l','e','s','\0'};
 static const WCHAR ProgramFilesDirW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r','\0'};
 static const WCHAR ProgramFilesDirX86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',' ','(','x','8','6',')','\0'};
 static const WCHAR ProgramsW[] = {'P','r','o','g','r','a','m','s','\0'};
 static const WCHAR RecentW[] = {'R','e','c','e','n','t','\0'};
 static const WCHAR ResourcesW[] = {'R','e','s','o','u','r','c','e','s','\0'};
+static const WCHAR Saved_GamesW[] = {'S','a','v','e','d',' ','G','a','m','e','s','\0'};
+static const WCHAR SearchesW[] = {'S','e','a','r','c','h','e','s','\0'};
 static const WCHAR SendToW[] = {'S','e','n','d','T','o','\0'};
 static const WCHAR StartUpW[] = {'S','t','a','r','t','U','p','\0'};
 static const WCHAR Start_MenuW[] = {'S','t','a','r','t',' ','M','e','n','u','\0'};
+static const WCHAR Start_Menu_ProgramsW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\0'};
+static const WCHAR Start_Menu_Admin_ToolsW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'};
+static const WCHAR Start_Menu_StartupW[] = {'S','t','a','r','t',' ','M','e','n','u','\\','P','r','o','g','r','a','m','s','\\','S','t','a','r','t','U','p','\0'};
 static const WCHAR TemplatesW[] = {'T','e','m','p','l','a','t','e','s','\0'};
 static const WCHAR UsersW[] = {'U','s','e','r','s','\0'};
 static const WCHAR UsersPublicW[] = {'U','s','e','r','s','\\','P','u','b','l','i','c','\0'};
+static const WCHAR VideosW[] = {'V','i','d','e','o','s','\0'};
+static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S','a','m','p','l','e',' ','V','i','d','e','o','s','\0'};
 static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'};
 static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'};
 static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'};
@@ -847,7 +879,7 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_Programs,
         CSIDL_Type_User,
         ProgramsW,
-        MAKEINTRESOURCEW(IDS_PROGRAMS)
+        Start_Menu_ProgramsW
     },
     { /* 0x03 - CSIDL_CONTROLS (.CPL files) */
         &FOLDERID_ControlPanelFolder,
@@ -871,25 +903,25 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_Favorites,
         CSIDL_Type_User,
         FavoritesW,
-        MAKEINTRESOURCEW(IDS_FAVORITES)
+        FavoritesW
     },
     { /* 0x07 - CSIDL_STARTUP */
         &FOLDERID_Startup,
         CSIDL_Type_User,
         StartUpW,
-        MAKEINTRESOURCEW(IDS_STARTUP)
+        Start_Menu_StartupW
     },
     { /* 0x08 - CSIDL_RECENT */
         &FOLDERID_Recent,
         CSIDL_Type_User,
         RecentW,
-        MAKEINTRESOURCEW(IDS_RECENT)
+        RecentW
     },
     { /* 0x09 - CSIDL_SENDTO */
         &FOLDERID_SendTo,
         CSIDL_Type_User,
         SendToW,
-        MAKEINTRESOURCEW(IDS_SENDTO)
+        SendToW
     },
     { /* 0x0a - CSIDL_BITBUCKET - Recycle Bin */
         &FOLDERID_RecycleBinFolder,
@@ -901,7 +933,7 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_StartMenu,
         CSIDL_Type_User,
         Start_MenuW,
-        MAKEINTRESOURCEW(IDS_STARTMENU)
+        Start_MenuW
     },
     { /* 0x0c - CSIDL_MYDOCUMENTS */
         &GUID_NULL,
@@ -949,7 +981,7 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_NetHood,
         CSIDL_Type_User,
         NetHoodW,
-        MAKEINTRESOURCEW(IDS_NETHOOD)
+        NetHoodW
     },
     { /* 0x14 - CSIDL_FONTS */
         &FOLDERID_Fonts,
@@ -961,25 +993,25 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_Templates,
         CSIDL_Type_User,
         TemplatesW,
-        MAKEINTRESOURCEW(IDS_TEMPLATES)
+        TemplatesW
     },
     { /* 0x16 - CSIDL_COMMON_STARTMENU */
         &FOLDERID_CommonStartMenu,
         CSIDL_Type_AllUsers,
         Common_Start_MenuW,
-        MAKEINTRESOURCEW(IDS_STARTMENU)
+        Start_MenuW
     },
     { /* 0x17 - CSIDL_COMMON_PROGRAMS */
         &FOLDERID_CommonPrograms,
         CSIDL_Type_AllUsers,
         Common_ProgramsW,
-        MAKEINTRESOURCEW(IDS_PROGRAMS)
+        Start_Menu_ProgramsW
     },
     { /* 0x18 - CSIDL_COMMON_STARTUP */
         &FOLDERID_CommonStartup,
         CSIDL_Type_AllUsers,
         Common_StartUpW,
-        MAKEINTRESOURCEW(IDS_STARTUP)
+        Start_Menu_StartupW
     },
     { /* 0x19 - CSIDL_COMMON_DESKTOPDIRECTORY */
         &FOLDERID_PublicDesktop,
@@ -991,19 +1023,19 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_RoamingAppData,
         CSIDL_Type_User,
         AppDataW,
-        MAKEINTRESOURCEW(IDS_APPDATA)
+        AppDataW
     },
     { /* 0x1b - CSIDL_PRINTHOOD */
         &FOLDERID_PrintHood,
         CSIDL_Type_User,
         PrintHoodW,
-        MAKEINTRESOURCEW(IDS_PRINTHOOD)
+        PrintHoodW
     },
     { /* 0x1c - CSIDL_LOCAL_APPDATA */
         &FOLDERID_LocalAppData,
         CSIDL_Type_User,
         Local_AppDataW,
-        MAKEINTRESOURCEW(IDS_LOCAL_APPDATA)
+        Local_AppDataW
     },
     { /* 0x1d - CSIDL_ALTSTARTUP */
         &GUID_NULL,
@@ -1021,31 +1053,31 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_Favorites,
         CSIDL_Type_AllUsers,
         Common_FavoritesW,
-        MAKEINTRESOURCEW(IDS_FAVORITES)
+        FavoritesW
     },
     { /* 0x20 - CSIDL_INTERNET_CACHE */
         &FOLDERID_InternetCache,
         CSIDL_Type_User,
         CacheW,
-        MAKEINTRESOURCEW(IDS_INTERNET_CACHE)
+        Local_Settings_Temporary_Internet_FilesW
     },
     { /* 0x21 - CSIDL_COOKIES */
         &FOLDERID_Cookies,
         CSIDL_Type_User,
         CookiesW,
-        MAKEINTRESOURCEW(IDS_COOKIES)
+        CookiesW
     },
     { /* 0x22 - CSIDL_HISTORY */
         &FOLDERID_History,
         CSIDL_Type_User,
         HistoryW,
-        MAKEINTRESOURCEW(IDS_HISTORY)
+        Local_Settings_HistoryW
     },
     { /* 0x23 - CSIDL_COMMON_APPDATA */
         &FOLDERID_ProgramData,
         CSIDL_Type_AllUsers,
         Common_AppDataW,
-        MAKEINTRESOURCEW(IDS_APPDATA)
+        AppDataW
     },
     { /* 0x24 - CSIDL_WINDOWS */
         &FOLDERID_Windows,
@@ -1063,7 +1095,7 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_ProgramFiles,
         CSIDL_Type_CurrVer,
         ProgramFilesDirW,
-        MAKEINTRESOURCEW(IDS_PROGRAM_FILES)
+        Program_FilesW
     },
     { /* 0x27 - CSIDL_MYPICTURES */
         &FOLDERID_Pictures,
@@ -1087,43 +1119,43 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_ProgramFilesX86,
         CSIDL_Type_CurrVer,
         ProgramFilesDirX86W,
-        MAKEINTRESOURCEW(IDS_PROGRAM_FILESX86)
+        Program_Files_x86W
     },
     { /* 0x2b - CSIDL_PROGRAM_FILES_COMMON */
         &FOLDERID_ProgramFilesCommon,
         CSIDL_Type_CurrVer,
         CommonFilesDirW,
-        MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMON)
+        Program_Files_Common_FilesW
     },
     { /* 0x2c - CSIDL_PROGRAM_FILES_COMMONX86 */
         &FOLDERID_ProgramFilesCommonX86,
         CSIDL_Type_CurrVer,
         CommonFilesDirX86W,
-        MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMONX86)
+        Program_Files_x86_Common_FilesW
     },
     { /* 0x2d - CSIDL_COMMON_TEMPLATES */
         &FOLDERID_CommonTemplates,
         CSIDL_Type_AllUsers,
         Common_TemplatesW,
-        MAKEINTRESOURCEW(IDS_TEMPLATES)
+        TemplatesW
     },
     { /* 0x2e - CSIDL_COMMON_DOCUMENTS */
         &FOLDERID_PublicDocuments,
         CSIDL_Type_AllUsers,
         Common_DocumentsW,
-        MAKEINTRESOURCEW(IDS_COMMON_DOCUMENTS)
+        DocumentsW
     },
     { /* 0x2f - CSIDL_COMMON_ADMINTOOLS */
         &FOLDERID_CommonAdminTools,
         CSIDL_Type_AllUsers,
         Common_Administrative_ToolsW,
-        MAKEINTRESOURCEW(IDS_ADMINTOOLS)
+        Start_Menu_Admin_ToolsW
     },
     { /* 0x30 - CSIDL_ADMINTOOLS */
         &FOLDERID_AdminTools,
         CSIDL_Type_User,
         Administrative_ToolsW,
-        MAKEINTRESOURCEW(IDS_ADMINTOOLS)
+        Start_Menu_Admin_ToolsW
     },
     { /* 0x31 - CSIDL_CONNECTIONS */
         &FOLDERID_ConnectionsFolder,
@@ -1153,19 +1185,19 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_PublicMusic,
         CSIDL_Type_AllUsers,
         CommonMusicW,
-        MAKEINTRESOURCEW(IDS_COMMON_MUSIC)
+        MusicW
     },
     { /* 0x36 - CSIDL_COMMON_PICTURES */
         &FOLDERID_PublicPictures,
         CSIDL_Type_AllUsers,
         CommonPicturesW,
-        MAKEINTRESOURCEW(IDS_COMMON_PICTURES)
+        PicturesW
     },
     { /* 0x37 - CSIDL_COMMON_VIDEO */
         &FOLDERID_PublicVideos,
         CSIDL_Type_AllUsers,
         CommonVideoW,
-        MAKEINTRESOURCEW(IDS_COMMON_VIDEOS)
+        VideosW
     },
     { /* 0x38 - CSIDL_RESOURCES */
         &FOLDERID_ResourceDir,
@@ -1183,13 +1215,13 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_CommonOEMLinks,
         CSIDL_Type_AllUsers,
         NULL,
-        MAKEINTRESOURCEW(IDS_COMMON_OEM_LINKS)
+        OEM_LinksW
     },
     { /* 0x3b - CSIDL_CDBURN_AREA */
         &FOLDERID_CDBurning,
         CSIDL_Type_User,
         CD_BurningW,
-        MAKEINTRESOURCEW(IDS_CDBURN_AREA)
+        Local_Settings_CD_BurningW
     },
     { /* 0x3c unassigned */
         &GUID_NULL,
@@ -1237,7 +1269,7 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_Contacts,
         CSIDL_Type_User,
         ContactsW,
-        MAKEINTRESOURCEW(IDS_CONTACTS)
+        ContactsW
     },
     { /* 0x44 */
         &FOLDERID_DeviceMetadataStore,
@@ -1249,7 +1281,7 @@ static const CSIDL_DATA CSIDL_Data[] =
         &GUID_NULL,
         CSIDL_Type_User,
         NULL,
-        MAKEINTRESOURCEW(IDS_DOCUMENTS)
+        DocumentsW
     },
     { /* 0x46 */
         &FOLDERID_DocumentsLibrary,
@@ -1261,7 +1293,7 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_Downloads,
         CSIDL_Type_User,
         NULL,
-        MAKEINTRESOURCEW(IDS_DOWNLOADS)
+        DownloadsW
     },
     { /* 0x48 */
         &FOLDERID_Games,
@@ -1297,13 +1329,13 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_Links,
         CSIDL_Type_User,
         NULL,
-        MAKEINTRESOURCEW(IDS_LINKS)
+        LinksW
     },
     { /* 0x4e */
         &FOLDERID_LocalAppDataLow,
         CSIDL_Type_User,
         NULL,
-        MAKEINTRESOURCEW(IDS_LOCAL_APPDATA_LOW)
+        AppData_LocalLowW
     },
     { /* 0x4f */
         &FOLDERID_MusicLibrary,
@@ -1321,7 +1353,7 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_PhotoAlbums,
         CSIDL_Type_User,
         NULL,
-        MAKEINTRESOURCEW(IDS_PHOTO_ALBUMS)
+        Pictures_Slide_ShowsW
     },
     { /* 0x52 */
         &FOLDERID_PicturesLibrary,
@@ -1333,7 +1365,7 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_Playlists,
         CSIDL_Type_User,
         NULL,
-        MAKEINTRESOURCEW(IDS_PLAYLISTS)
+        Music_PlaylistsW
     },
     { /* 0x54 */
         &FOLDERID_ProgramFilesX64,
@@ -1357,25 +1389,25 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_PublicDownloads,
         CSIDL_Type_AllUsers,
         NULL,
-        MAKEINTRESOURCEW(IDS_PUBLIC_DOWNLOADS)
+        DownloadsW
     },
     { /* 0x58 */
         &FOLDERID_PublicGameTasks,
         CSIDL_Type_AllUsers,
         NULL,
-        MAKEINTRESOURCEW(IDS_PUBLIC_GAME_TASKS)
+        Microsoft_Windows_GameExplorerW
     },
     { /* 0x59 */
         &FOLDERID_PublicLibraries,
         CSIDL_Type_AllUsers,
         NULL,
-        MAKEINTRESOURCEW(IDS_PUBLIC_LIBRARIES)
+        Microsoft_Windows_LibrariesW
     },
     { /* 0x5a */
         &FOLDERID_PublicRingtones,
         CSIDL_Type_AllUsers,
         NULL,
-        MAKEINTRESOURCEW(IDS_PUBLIC_RINGTONES)
+        Microsoft_Windows_RingtonesW
     },
     { /* 0x5b */
         &FOLDERID_QuickLaunch,
@@ -1399,37 +1431,37 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_SampleMusic,
         CSIDL_Type_AllUsers,
         NULL,
-        MAKEINTRESOURCEW(IDS_SAMPLE_MUSIC)
+        Music_Sample_MusicW
     },
     { /* 0x5f */
         &FOLDERID_SamplePictures,
         CSIDL_Type_AllUsers,
         NULL,
-        MAKEINTRESOURCEW(IDS_SAMPLE_PICTURES)
+        Pictures_Sample_PicturesW
     },
     { /* 0x60 */
         &FOLDERID_SamplePlaylists,
         CSIDL_Type_AllUsers,
         NULL,
-        MAKEINTRESOURCEW(IDS_SAMPLE_PLAYLISTS)
+        Music_Sample_PlaylistsW
     },
     { /* 0x61 */
         &FOLDERID_SampleVideos,
         CSIDL_Type_AllUsers,
         NULL,
-        MAKEINTRESOURCEW(IDS_SAMPLE_VIDEOS)
+        Videos_Sample_VideosW
     },
     { /* 0x62 */
         &FOLDERID_SavedGames,
         CSIDL_Type_User,
         NULL,
-        MAKEINTRESOURCEW(IDS_SAVED_GAMES)
+        Saved_GamesW
     },
     { /* 0x63 */
         &FOLDERID_SavedSearches,
         CSIDL_Type_User,
         NULL,
-        MAKEINTRESOURCEW(IDS_SAVED_SEARCHES)
+        SearchesW
     },
     { /* 0x64 */
         &FOLDERID_SEARCH_CSC,
@@ -1489,7 +1521,7 @@ static const CSIDL_DATA CSIDL_Data[] =
         &FOLDERID_UserProfiles,
         CSIDL_Type_CurrVer,
         UsersW,
-        MAKEINTRESOURCEW(IDS_USER_PROFILES)
+        UsersW
     },
     { /* 0x6e */
         &FOLDERID_UserProgramFiles,
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index ad3d2a22605..183a75e152d 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -67,40 +67,27 @@
 #define IDS_PERSONAL                46
 #define IDS_FAVORITES               47
 #define IDS_STARTUP                 48
-#define IDS_RECENT                  49
-#define IDS_SENDTO                  50
 #define IDS_STARTMENU               51
 #define IDS_MYMUSIC                 52
 #define IDS_MYVIDEOS                53
 #define IDS_DESKTOPDIRECTORY        54
 #define IDS_NETHOOD                 55
 #define IDS_TEMPLATES               56
-#define IDS_APPDATA                 57
 #define IDS_PRINTHOOD               58
-#define IDS_LOCAL_APPDATA           59
-#define IDS_INTERNET_CACHE          60
-#define IDS_COOKIES                 61
 #define IDS_HISTORY                 62
 #define IDS_PROGRAM_FILES           63
 #define IDS_MYPICTURES              64
-#define IDS_PROGRAM_FILES_COMMON    65
+#define IDS_COMMON_FILES            65
 #define IDS_COMMON_DOCUMENTS        66
 #define IDS_ADMINTOOLS              67
 #define IDS_COMMON_MUSIC            68
 #define IDS_COMMON_PICTURES         69
 #define IDS_COMMON_VIDEOS           70
-#define IDS_CDBURN_AREA             71
 #define IDS_PROGRAM_FILESX86        72
-#define IDS_PROGRAM_FILES_COMMONX86 73
 #define IDS_CONTACTS                74
 #define IDS_LINKS                   75
-#define IDS_PHOTO_ALBUMS            76
-#define IDS_PICTURES_LIBRARY        77
+#define IDS_SLIDE_SHOWS             76
 #define IDS_PLAYLISTS               78
-#define IDS_PUBLIC_DOWNLOADS        79
-#define IDS_PUBLIC_GAME_TASKS       84
-#define IDS_PUBLIC_LIBRARIES        85
-#define IDS_PUBLIC_RINGTONES        86
 #define IDS_SAMPLE_MUSIC            87
 #define IDS_SAMPLE_PICTURES         88
 #define IDS_SAMPLE_PLAYLISTS        89
@@ -108,10 +95,8 @@
 #define IDS_SAVED_GAMES             91
 #define IDS_SAVED_SEARCHES          92
 #define IDS_USER_PROFILES           93
-#define IDS_COMMON_OEM_LINKS        94
 #define IDS_DOCUMENTS               95
 #define IDS_DOWNLOADS               96
-#define IDS_LOCAL_APPDATA_LOW       97
 
 #define IDS_CREATEFOLDER_DENIED     128
 #define IDS_CREATEFOLDER_CAPTION    129
diff --git a/po/ar.po b/po/ar.po
index 7782a899ce2..c7a9d269ac9 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -58,8 +58,8 @@ msgstr "معلومات"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -137,7 +137,7 @@ msgstr ""
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -173,7 +173,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2521,7 +2521,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7688,63 +7688,63 @@ msgstr "ا&خرج"
 msgid "&About Control Panel"
 msgstr "&عن لوح الملاحظات"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr ""
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr ""
 
-#: shell32.rc:329
+#: shell32.rc:316
 #, fuzzy
 msgid "About %s"
 msgstr "&عن لوح الملاحظات"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 #, fuzzy
 msgid "&Open:"
 msgstr "ا&فتح...\tCtrl+O"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7825,143 +7825,108 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
-
-#: shell32.rc:200
-msgid "My Documents"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
 #: shell32.rc:201
-msgid "Favorites"
+msgid "My Documents"
 msgstr ""
 
 #: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
+msgid "Favorites"
 msgstr ""
 
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr ""
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr ""
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 #, fuzzy
 msgid "My Pictures"
 msgstr "احفظ &ك‍..."
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr ""
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "الم&حتويات"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 #, fuzzy
 msgid "Contacts"
 msgstr "الم&حتويات"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7977,54 +7942,40 @@ msgstr "معلومات"
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+msgid "Sample Music"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
+msgstr "احفظ &ك‍..."
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "احفظ &ك‍..."
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "احفظ &ك‍..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "&مساعدة"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -8092,11 +8043,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -8113,23 +8064,23 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "ملفات النصوص (*.txt)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8140,7 +8091,7 @@ msgstr ""
 "\n"
 "أتريد إنشاء ملف جديد؟"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8151,11 +8102,11 @@ msgstr ""
 "\n"
 "أتريد إنشاء ملف جديد؟"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8172,7 +8123,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -10601,10 +10552,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13165,10 +13112,6 @@ msgstr ""
 msgid "&Define..."
 msgstr ""
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 #, fuzzy
 msgid "Fonts"
diff --git a/po/bg.po b/po/bg.po
index 2dd8518aa33..13abd266090 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -61,8 +61,8 @@ msgstr "Информация"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -148,7 +148,7 @@ msgstr "Инсталирай"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -188,7 +188,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Име"
 
@@ -2519,7 +2519,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7805,53 +7805,53 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr ""
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Избор на папка"
 
-#: shell32.rc:303
+#: shell32.rc:290
 #, fuzzy
 msgid "Folder:"
 msgstr "Папка"
 
-#: shell32.rc:309
+#: shell32.rc:296
 #, fuzzy
 msgid "&Make New Folder"
 msgstr "Създай нова папка"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Да"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Не"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Относно %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine беше създаден за вас от:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7859,11 +7859,11 @@ msgstr ""
 "Въведете име на програма, папка, документ или Интернет ресурс и Wine ще го "
 "отвори за вас."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr ""
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Избери..."
@@ -7947,147 +7947,112 @@ msgstr "Изключване"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Искате ли да прекратите вашата Wine сесия?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Start Menu\\Programs"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr ""
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Моите документи"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favorites"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Start Menu\\Programs\\StartUp"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recent"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Start Menu"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "My Music"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "My Video"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Работен плот"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "NetHood"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Templates"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "PrintHood"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "My Pictures"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Копиране на файлове..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documents"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start Menu\\Programs\\Administrative Tools"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Documents\\My Music"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Documents\\My Pictures"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Documents\\My Video"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 #, fuzzy
 msgid "Program Files (x86)"
 msgstr "Program Files"
 
 #: shell32.rc:221
 #, fuzzy
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files\\Common Files"
-
-#: shell32.rc:228
-#, fuzzy
 msgid "Contacts"
 msgstr "&Съдържание"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
+#: shell32.rc:224
 #, fuzzy
-msgid "Downloads"
-msgstr "Изтегляне..."
+msgid "Playlists"
+msgstr "Възпроизведи"
 
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
@@ -8102,56 +8067,43 @@ msgstr "LAN връзка"
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Пример"
+
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
+msgstr "&Съхрани изображението като..."
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "&Съхрани видео изображението като..."
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "Съхрани &като..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "&Търсене"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
+#: shell32.rc:233
 #, fuzzy
-msgid "OEM Links"
-msgstr "&Отвори връзката"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr ""
+msgid "Downloads"
+msgstr "Изтегляне..."
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8218,11 +8170,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -8239,26 +8191,26 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "Текстови файлове (*.txt)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Наистина ли искате да изтриете '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Наистина ли искате да изтриете тези %1 елемента?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Потвърдете изтриването на файла"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8268,7 +8220,7 @@ msgstr ""
 "Файлът вече съществува.\n"
 "Искате ли да го замените?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8278,12 +8230,12 @@ msgstr ""
 "Файлът вече съществува.\n"
 "Искате ли да го замените?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Потвърдете презаписа на файла"
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8300,7 +8252,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 #, fuzzy
 msgid "Wine License"
 msgstr "Wine Помощ"
@@ -10753,10 +10705,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13354,10 +13302,6 @@ msgstr "&Отметки"
 msgid "&Define..."
 msgstr "&Задай..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Шрифтове"
diff --git a/po/ca.po b/po/ca.po
index bfdf86aecb3..c008ee521d9 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -62,8 +62,8 @@ msgstr "Informació de Suport"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -146,7 +146,7 @@ msgstr "&Instal·la"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "No especificat"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Nom"
 
@@ -2533,7 +2533,7 @@ msgstr "Ús millorat de clau (propietat)"
 msgid "Friendly name"
 msgstr "Nom amistós"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Descripció"
 
@@ -7741,51 +7741,51 @@ msgstr "&Surt"
 msgid "&About Control Panel"
 msgstr "&Quant al Panell de Control..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Navegar per Carpeta"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Carpeta:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Fer Una Nova Carpeta"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Missatge"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Sí"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Sí a &tots"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&No"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Quant al %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Llicència de Wine"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Executant en %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "El Wine ha estat construit per:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7793,11 +7793,11 @@ msgstr ""
 "Introdueix el nom d'un programa, carpeta, document, o recurs de web, i el "
 "Wine el obrirà per vostè."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Obrir:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Navega..."
@@ -7875,143 +7875,111 @@ msgstr "Atura"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Voleu aturar la vostre sessió del Wine?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Menú d'Inici\\Programes"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programes"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Els meus documents"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Preferits"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Menú d'Inici\\Programes\\Inici"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recent"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Envia a"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Menú d'Inici"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "La meva música"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Els meus vídeos"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Escriptori"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Entorn de xarxa"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Plantilles"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Dades de Programa"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Veïnat d'impressió"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Configuració Local\\Dades de Programa"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Historia"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Configuració Local\\Arxius Temporals d'Internet"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Galetes"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Configuració Local\\Historial"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Fitxers de Programa"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Les meves imatges"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Fitxers de Programa\\Fitxers Comuns"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Nom Comú"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documents"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Menú d'Inici\\Programes\\Eines Administratives"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Música"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Imatges"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Vídeos"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Configuració Local\\Dades de Programa\\Microsoft\\Gravació de CD"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Fitxers de Programa (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Fitxers de Programa (x86)\\Fitxers Comuns"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Contactes"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Enllaços"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Imatges\\Presentacions de Diapositives"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Música\\Llistes de Reproducció"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Baixades"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Estat"
@@ -8024,53 +7992,41 @@ msgstr "Ubicació"
 msgid "Model"
 msgstr "Model"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Biblioteques"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Tons de Trucada"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Música\\Mostra de Música"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Imatges\\Mostra d'Imatges"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Música\\Mostra de Llistes de Reproducció"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Vídeos\\Mostra de Vídeos"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Jocs Desats"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Cercas"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Usuaris"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "Enllaços OEM"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr ""
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Baixades"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8147,11 +8103,11 @@ msgstr ""
 "fitxers en la carpeta seleccionada seran reemplaçats. Encara voleu moure o\n"
 "copiar la carpeta?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Nova Carpeta"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Panell de Control de Wine"
 
@@ -8167,24 +8123,24 @@ msgstr "No es pot mostrar el quadre de diàleg Navegar (error intern)"
 msgid "Executable files (*.exe)"
 msgstr "Fitxers executables (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 "No hi ha cap programa de Windows configurat per obrir aquest tipus de fitxer."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Esteu segur que voleu suprimir permanentment '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Esteu segur que voleu suprimir permanentment aquests %1 articles?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "Confirma eliminació"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8194,7 +8150,7 @@ msgstr ""
 "\n"
 "El voleu reemplaçar?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8204,11 +8160,11 @@ msgstr ""
 "\n"
 "La voleu reemplaçar?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "Confirma sobreescriptura"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8239,7 +8195,7 @@ msgstr ""
 "juntament amb el Wine, si no, escriviu a la Free Software Foundation, Inc., "
 "51 Franklin St, Fifth Floor, Boston, MA 02110-1301, EUA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Llicència del Wine"
 
@@ -11047,10 +11003,6 @@ msgstr "Fitxer `%s' existeix. No s'ha sobreescrit."
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Desa el grup com `%s per evitar sobreescriure els fitxers originals."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programes"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Biblioteques (*.dll)"
@@ -13716,10 +13668,6 @@ msgstr "&Marca"
 msgid "&Define..."
 msgstr "&Defineix..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Historia"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Fonts"
diff --git a/po/cs.po b/po/cs.po
index 10b923ba200..6c275cb4ea3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -60,8 +60,8 @@ msgstr "Informace"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -142,7 +142,7 @@ msgstr "Instalovat téma..."
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -182,7 +182,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Nebyl zadán žádný příkaz."
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 #, fuzzy
 msgid "Name"
 msgstr ""
@@ -2542,7 +2542,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7876,53 +7876,53 @@ msgstr "&Konec"
 msgid "&About Control Panel"
 msgstr ""
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Procházet..."
 
-#: shell32.rc:303
+#: shell32.rc:290
 #, fuzzy
 msgid "Folder:"
 msgstr "Domácí adresáře"
 
-#: shell32.rc:309
+#: shell32.rc:296
 #, fuzzy
 msgid "&Make New Folder"
 msgstr "Vytvořit novou složku"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Ano"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Ne"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "O aplikaci %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine je dílem:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7930,11 +7930,11 @@ msgstr ""
 "Zadejte název programu, složky, dokumentu, nebo zdroje v síti Internet a "
 "Wine jej pro vás otevře."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Otevřít:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Procházet"
@@ -8018,149 +8018,113 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programy"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Dokumenty"
 
-#: shell32.rc:201
+#: shell32.rc:202
 #, fuzzy
 msgid "Favorites"
 msgstr "Oblí&bené"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr ""
-
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Plocha"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-#, fuzzy
-msgid "Application Data"
-msgstr "Volby"
-
-#: shell32.rc:212
+#: shell32.rc:210
 #, fuzzy
 msgid "PrintHood"
 msgstr "Tisk"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 #, fuzzy
 msgid "Program Files"
 msgstr "Programy"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr ""
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Kopíruji soubory..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr ""
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr ""
 
-#: shell32.rc:226
+#: shell32.rc:220
 #, fuzzy
 msgid "Videos"
 msgstr "video"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr ""
-
-#: shell32.rc:218
+#: shell32.rc:213
 #, fuzzy
 msgid "Program Files (x86)"
 msgstr "Programy"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 #, fuzzy
 msgid "Contacts"
 msgstr "&Obsah"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Linky"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -8176,40 +8140,30 @@ msgstr "Volby"
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Ukázka"
+
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "Ukázka"
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "Uložit j&ako..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr ""
@@ -8218,17 +8172,12 @@ msgstr ""
 "#-#-#-#-#  cs.po (Wine)  #-#-#-#-#\n"
 "&Hledání"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-#, fuzzy
-msgid "OEM Links"
-msgstr "Linky"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -8296,11 +8245,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -8317,26 +8266,26 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "Textové soubory (*.txt)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Opravdu chcete odstranit '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Opravdu chcete odstranit těchto %1 položek?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Potvrdit odstranění souboru"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8346,7 +8295,7 @@ msgstr ""
 "Soubor již existuje.\n"
 "Chcete ho přepsat novým?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8356,12 +8305,12 @@ msgstr ""
 "Soubor již existuje.\n"
 "Chcete ho přepsat novým?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Potvrdit přepsání souboru"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8395,7 +8344,7 @@ msgstr ""
 "\n"
 "Přečtěte si soubor COPYING.LIB pro získání informací o licenci.\n"
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -11145,10 +11094,6 @@ msgstr "Soubor `%s' existuje. Nebude přepsán."
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Uložit skupinu jako `%s', aby nebyly přepsán originální soubory."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programy"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Knihovny (*.dll)"
@@ -13806,10 +13751,6 @@ msgstr "&Záložka"
 msgid "&Define..."
 msgstr "Při&dat..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Písma"
diff --git a/po/da.po b/po/da.po
index 051c7db253f..c45c335d7b1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -62,8 +62,8 @@ msgstr ""
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -145,7 +145,7 @@ msgstr "&Installer"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Ikke specificeret"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Navn"
 
@@ -2546,7 +2546,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7890,51 +7890,51 @@ msgstr "&Afslut"
 msgid "&About Control Panel"
 msgstr "&Om Kontrolpanelet..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Søg efter mappe"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Lav ny folder"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Ja"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Ja to &alt"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Nej"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Om %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Wine &licens"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Kører på %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine havde ikke været mulig uden hjælp fra disse personer:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7942,11 +7942,11 @@ msgstr ""
 "Skriv navnet på et program, en mappe, et dokument eller Internet ressource, "
 "og Wine åbner det for dig."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Åbn:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Gennemse"
@@ -8030,11 +8030,11 @@ msgstr "Luk ned"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Vil du lukke din Wine session?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Start Menu\\Programmer"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programmer"
 
-#: shell32.rc:200
+#: shell32.rc:201
 #, fuzzy
 msgid "My Documents"
 msgstr ""
@@ -8043,139 +8043,104 @@ msgstr ""
 "#-#-#-#-#  da.po (Wine)  #-#-#-#-#\n"
 "Mine dokumenter"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favoriter"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Start Menu\\Programmer\\Start"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recent"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Start Menu"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Min Musik"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Mine Film"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "NetHood"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Skabeloner"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Programdata"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "PrintHood"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Lokale indstillinger\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "History"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Lokale indstillinger\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Lokale indstillinger\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Mine Billeder"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "ProgrammerFælles Filer"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Kopierer filer..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documenter"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start MenuProgrammerAdministrative Værktøjer"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Dokumenter\\Min Musik"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Dokumenter\\Mine Billeder"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Dokumenter\\Mine Film"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Lokale indstillingerApplikations DataMicrosoftCD Brændning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 #, fuzzy
 msgid "Program Files (x86)"
 msgstr "Program Files"
 
 #: shell32.rc:221
 #, fuzzy
-msgid "Program Files (x86)\\Common Files"
-msgstr "ProgrammerFælles Filer"
-
-#: shell32.rc:228
-#, fuzzy
 msgid "Contacts"
 msgstr "&Indhold"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Genveje"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
+#: shell32.rc:224
 #, fuzzy
-msgid "Downloads"
-msgstr "Henter..."
+msgid "Playlists"
+msgstr "Afspil"
 
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
@@ -8189,35 +8154,26 @@ msgstr "Placering"
 msgid "Model"
 msgstr "Model"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Eksempel"
+
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
+msgstr "Gem billede &som..."
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "Gem video &som..."
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr ""
@@ -8226,24 +8182,20 @@ msgstr ""
 "#-#-#-#-#  da.po (Wine)  #-#-#-#-#\n"
 "Gemme &som..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "&Søg"
 
-#: shell32.rc:242
+#: shell32.rc:231
 #, fuzzy
 msgid "Users"
 msgstr "Brugernavn"
 
-#: shell32.rc:243
+#: shell32.rc:233
 #, fuzzy
-msgid "OEM Links"
-msgstr "Genveje"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr ""
+msgid "Downloads"
+msgstr "Henter..."
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8322,11 +8274,11 @@ msgstr ""
 "eller kopiere\n"
 "mappen?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Ny Mappe"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine Kontrolpanel"
 
@@ -8342,27 +8294,27 @@ msgstr "Kan ikke vise Gennemse dialogboksen (intern fejl)"
 msgid "Executable files (*.exe)"
 msgstr "Program Filer (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 "Der er ikke noget Windows program, konfigureret til at åbne denne type fil."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Er du sikker på du vil slette '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Er du sikker på du vil slette disse %1 filer?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Bekræft sletning af fil"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8372,7 +8324,7 @@ msgstr ""
 "Filen findes allerede.\n"
 "Vil du erstatte den?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8382,12 +8334,12 @@ msgstr ""
 "Filen findes allerede.\n"
 "Vil du erstatte den?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Bekræft overskrivning af fil"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8418,7 +8370,7 @@ msgstr ""
 "sammen med dette program; hvis ikke, skriv til: the Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Licensbetingelser"
 
@@ -11217,10 +11169,6 @@ msgstr "Filen '%s' fandtes allerede, og blev ikke overskrevet."
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Gem gruppen som '%s' for at undgå at overskrive de originale filer."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programmer"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Biblioteker (*.dll)"
@@ -13906,10 +13854,6 @@ msgstr "Bog&mærke"
 msgid "&Define..."
 msgstr "&Definer..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "History"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Skrifttype"
diff --git a/po/de.po b/po/de.po
index ba0e00acb7e..12a89cfbf96 100644
--- a/po/de.po
+++ b/po/de.po
@@ -61,8 +61,8 @@ msgstr "Informationen"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -146,7 +146,7 @@ msgstr "&Installieren"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -184,7 +184,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Nicht angegeben"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Name"
 
@@ -2520,7 +2520,7 @@ msgstr "Erweiterte Schlüsselnutzung (Eigenschaft)"
 msgid "Friendly name"
 msgstr "Angezeigter Name"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -7718,51 +7718,51 @@ msgstr "&Beenden"
 msgid "&About Control Panel"
 msgstr "&Über Systemsteuerung"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Verzeichnis auswählen"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Verzeichnis:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Neues Verzeichnis erstellen"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Meldung"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Ja"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Ja zu &allen"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Nein"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Informationen über %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Lizenz"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Wine Version %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine wurde für Sie gekeltert von:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7770,11 +7770,11 @@ msgstr ""
 "Geben sie den Namen eines Programmes, eines Ordners, eines Dokumentes oder "
 "einer Internet-Ressource ein, und Wine wird es öffnen."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "Ö&ffnen:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Durchsuchen..."
@@ -7852,143 +7852,111 @@ msgstr "Beenden"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Möchten Sie die aktuelle Wine Sitzung beenden?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Startmenü\\Programme"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programme"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Meine Dokumente"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favoriten"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Startmenü\\Programme\\Autostart"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recent"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Startmenü"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Eigene Musik"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Eigene Videos"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Desktop"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Netzwerkumgebung"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Anwendungsdaten"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Druckumgebung"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Lokale Einstellungen\\Anwendungsdaten"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Verlauf"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Lokale Einstellungen\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Lokale Einstellungen\\Verlauf"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Programme"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Eigene Bilder"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Programme\\Gemeinsame Dateien"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Allgemeiner Name"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Dokumente"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Startmenü\\Programme\\Verwaltung"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Musik"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Bilder"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Videos"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Programme (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Programme (x86)\\Gemeinsame Dateien"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Links"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Bilder\\Diashows"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Musik\\Wiedergabelisten"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Downloads"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Status"
@@ -8001,53 +7969,41 @@ msgstr "Ort"
 msgid "Model"
 msgstr "Modell"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Bibliotheken"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Ringtones"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Musik\\Beispielmusik"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Bilder\\Beispielbilder"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Musik\\Beispielwiedergabelisten"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Videos\\Beispielvideos"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Gespeicherte Spiele"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Suchvorgänge"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Benutzer"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Links"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "Anwendungsdaten\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Downloads"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8131,11 +8087,11 @@ msgstr ""
 "wie die im ausgewählten Ordner, werden sie ersetzt.\n"
 "Möchten sie trotzdem fortfahren?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Neuer Ordner"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine Systemsteuerung"
 
@@ -8151,23 +8107,23 @@ msgstr "Konnte Durchsuchen-Dialog nicht anzeigen (interner Fehler)"
 msgid "Executable files (*.exe)"
 msgstr "Programme (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "Es ist kein Programm mit diesem Dateityp verknüpft."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Sind Sie sich sicher, dass Sie '%1'  für immer löschen möchten?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Sind Sie sich sicher, dass Sie diese %1 Objekte löschen möchten?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "Löschung bestätigen"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8177,7 +8133,7 @@ msgstr ""
 "\n"
 "Wollen Sie sie überschreiben?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8187,11 +8143,11 @@ msgstr ""
 "\n"
 "Wollen Sie ihn überschreiben?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "Überschreiben bestätigen"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8222,7 +8178,7 @@ msgstr ""
 "Public License erhalten haben; wenn nicht schreiben Sie der Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine Lizenz"
 
@@ -11033,10 +10989,6 @@ msgstr ""
 "Die Programmgruppe wird als „%s“ gesichert, um das Überschreiben der "
 "Originaldatei zu verhindern."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programme"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Bibliotheken (*.dll)"
@@ -13669,10 +13621,6 @@ msgstr "&Lesezeichen"
 msgid "&Define..."
 msgstr "&Definieren..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Verlauf"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Schriftarten"
diff --git a/po/el.po b/po/el.po
index 1403fe0e2d0..75c170d3394 100644
--- a/po/el.po
+++ b/po/el.po
@@ -57,8 +57,8 @@ msgstr ""
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -137,7 +137,7 @@ msgstr ""
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -174,7 +174,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2479,7 +2479,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7687,63 +7687,63 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr ""
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 #, fuzzy
 msgid "&Make New Folder"
 msgstr "Δημιουργία νέου καταλόγου"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 #, fuzzy
 msgid "&No"
 msgstr "όχι"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr ""
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr ""
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7823,146 +7823,110 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Τα Έγγραφά μου"
 
-#: shell32.rc:201
+#: shell32.rc:202
 #, fuzzy
 msgid "Favorites"
 msgstr "Α&γαπημένα"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr ""
-
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Επιφάνεια Εργασίας"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-#, fuzzy
-msgid "Application Data"
-msgstr "Επιλογές"
-
-#: shell32.rc:212
+#: shell32.rc:210
 #, fuzzy
 msgid "PrintHood"
 msgstr "Εκτύπωση"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr ""
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Μη έγγυρος(οι) χαρακτήρας(ες) στο μονοπάτι"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 #, fuzzy
 msgid "Contacts"
 msgstr "&Περιεχόμενα"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7978,53 +7942,39 @@ msgstr "Επιλογές"
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Δείγμα"
+
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "Δείγμα"
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr ""
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "&Αναζήτηση"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -8092,11 +8042,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -8112,23 +8062,23 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr ""
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8138,7 +8088,7 @@ msgstr ""
 "Το αρχείο υπάρχει ήδη.\n"
 "Θέλετε να το αντικαταστήσετε;"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8148,11 +8098,11 @@ msgstr ""
 "Το αρχείο υπάρχει ήδη.\n"
 "Θέλετε να το αντικαταστήσετε;"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8169,7 +8119,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -10581,10 +10531,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13120,10 +13066,6 @@ msgstr ""
 msgid "&Define..."
 msgstr ""
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Γραμματοσειρές"
diff --git a/po/en.po b/po/en.po
index c0d69a1ffdf..e4030120b8e 100644
--- a/po/en.po
+++ b/po/en.po
@@ -56,8 +56,8 @@ msgstr "Support Information"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -132,7 +132,7 @@ msgstr "&Install"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -170,7 +170,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Not specified"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Name"
 
@@ -2449,7 +2449,7 @@ msgstr "Enhanced key usage (property)"
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Description"
 
@@ -7564,61 +7564,61 @@ msgstr "E&xit"
 msgid "&About Control Panel"
 msgstr "&About Control Panel"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr ""
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Message"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr ""
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "About %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Wine &licence"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Open:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Browse..."
@@ -7696,142 +7696,106 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "My Documents"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favourites"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr ""
-
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Desktop"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "PrintHood"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr ""
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "History"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "My Pictures"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr ""
+#: shell32.rc:215
+msgid "Common Files"
+msgstr "Common Files"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documents"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr "Pictures"
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr "Pictures"
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Contacts"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr ""
+#: shell32.rc:224
+msgid "Playlists"
+msgstr "Playlists"
 
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
@@ -7845,52 +7809,36 @@ msgstr "Location"
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+msgid "Sample Music"
+msgstr "Sample Music"
+
+#: shell32.rc:226
+msgid "Sample Pictures"
+msgstr "Sample Pictures"
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr ""
+#: shell32.rc:228
+msgid "Sample Videos"
+msgstr "Sample Videos"
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Saved Games"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Searches"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Users"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Links"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -7958,11 +7906,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -7978,41 +7926,41 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr ""
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8042,7 +7990,7 @@ msgstr ""
 "along with Wine; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine Licence"
 
@@ -10718,10 +10666,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13271,10 +13215,6 @@ msgstr "&Bookmark"
 msgid "&Define..."
 msgstr "&Define..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "History"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Fonts"
diff --git a/po/en_US.po b/po/en_US.po
index 3f5e09e2bea..35984913f8a 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -61,8 +61,8 @@ msgstr "Support Information"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -144,7 +144,7 @@ msgstr "&Install"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -184,7 +184,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Not specified"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Name"
 
@@ -2515,7 +2515,7 @@ msgstr "Enhanced key usage (property)"
 msgid "Friendly name"
 msgstr "Friendly name"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Description"
 
@@ -7696,51 +7696,51 @@ msgstr "E&xit"
 msgid "&About Control Panel"
 msgstr "&About Control Panel"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Browse for Folder"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Folder:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Make New Folder"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Message"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Yes"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Yes to &all"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&No"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "About %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Wine &license"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Running on %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine was brought to you by:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7748,11 +7748,11 @@ msgstr ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Open:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Browse..."
@@ -7830,142 +7830,106 @@ msgstr "Shutdown"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Do you want to shutdown your Wine session?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Start Menu\\Programs"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programs"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "My Documents"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favorites"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Start Menu\\Programs\\StartUp"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recent"
+msgid "StartUp"
+msgstr "StartUp"
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Start Menu"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "My Music"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "My Videos"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Desktop"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "NetHood"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Templates"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "PrintHood"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "History"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "My Pictures"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+msgid "Common Files"
+msgstr "Common Files"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documents"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+msgid "Administrative Tools"
+msgstr "Administrative Tools"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Music"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Pictures"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Videos"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Program Files (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files (x86)\\Common Files"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Contacts"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Links"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
-msgstr "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
+msgstr "Slide Shows"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr "Music\\Playlists"
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
+msgstr "Playlists"
 
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
@@ -7979,53 +7943,37 @@ msgstr "Location"
 msgid "Model"
 msgstr "Model"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+msgid "Sample Music"
+msgstr "Sample Music"
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Libraries"
+#: shell32.rc:226
+msgid "Sample Pictures"
+msgstr "Sample Pictures"
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Ringtones"
+#: shell32.rc:227
+msgid "Sample Playlists"
+msgstr "Sample Playlists"
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr "Music\\Sample Music"
+#: shell32.rc:228
+msgid "Sample Videos"
+msgstr "Sample Videos"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr "Pictures\\Sample Pictures"
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr "Music\\Sample Playlists"
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr "Videos\\Sample Videos"
-
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Saved Games"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Searches"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Users"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Links"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Downloads"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8102,11 +8050,11 @@ msgstr ""
 "selected folder they will be replaced. Do you still want to move or copy\n"
 "the folder?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "New Folder"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine Control Panel"
 
@@ -8122,23 +8070,23 @@ msgstr "Unable to display Browse dialog box (internal error)"
 msgid "Executable files (*.exe)"
 msgstr "Executable files (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "There is no Windows program configured to open this type of file."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Are you sure you wish to permanently delete '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Are you sure you wish to permanently delete these %1 items?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "Confirm deletion"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8148,7 +8096,7 @@ msgstr ""
 "\n"
 "Do you want to replace it?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8158,11 +8106,11 @@ msgstr ""
 "\n"
 "Do you want to replace it?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "Confirm overwrite"
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8192,7 +8140,7 @@ msgstr ""
 "along with Wine; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine License"
 
@@ -10935,10 +10883,6 @@ msgstr "File `%s' exists. Not overwritten."
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Save group as `%s to prevent overwriting original files."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programs"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Libraries (*.dll)"
@@ -13552,10 +13496,6 @@ msgstr "&Bookmark"
 msgid "&Define..."
 msgstr "&Define..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "History"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Fonts"
diff --git a/po/eo.po b/po/eo.po
index 7686effc7bf..f2f15160214 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -61,8 +61,8 @@ msgstr "Informo pri"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -143,7 +143,7 @@ msgstr "&Notu..."
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -183,7 +183,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Nomo"
 
@@ -2540,7 +2540,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Description"
 
@@ -7817,53 +7817,53 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr ""
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Foliu Dosierujon"
 
-#: shell32.rc:303
+#: shell32.rc:290
 #, fuzzy
 msgid "Folder:"
 msgstr "New Folder"
 
-#: shell32.rc:309
+#: shell32.rc:296
 #, fuzzy
 msgid "&Make New Folder"
 msgstr "Kreu Novan Dosieujon"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Jes"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Ne"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Pri %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine estas disponebla dank'al:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7871,11 +7871,11 @@ msgstr ""
 "Skribu nomon de programo, de dosierujo, de documento aý de Interreta fonto, "
 "kaj Wine malfermos øin."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "Malfermu:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "Foliu..."
@@ -7959,145 +7959,110 @@ msgstr "Adiaýu"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Æu vi volas adiaýi Wine?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Start Menu\\Programs"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr ""
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Miaj Dokumentoj"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favorites"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Start Menu\\Programs\\StartUp"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recent"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Start Menu"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Miaj Dokumentoj\\Muziko"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Miai Dokumentoj\\Video"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Desktop"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "NetHood"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Templates"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "PrintHood"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
-
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr "History"
 
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Maj Documentoj\\Bildoj"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Plenume dosierkopiadon..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documents"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start Menu\\Programs\\Administrative Tools"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Documents\\Musiko"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Documents\\Bildoj"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Documents\\Video"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 #, fuzzy
 msgid "Program Files (x86)"
 msgstr "Program Files"
 
 #: shell32.rc:221
 #, fuzzy
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files\\Common Files"
-
-#: shell32.rc:228
-#, fuzzy
 msgid "Contacts"
 msgstr "Enhavo"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -8113,54 +8078,41 @@ msgstr "LAN Interkonekto"
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Ekzemplo"
+
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
+msgstr "Documents\\Bildoj"
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "Miai Dokumentoj\\Video"
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "Konservu &kiel"
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "&Seræu"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -8228,11 +8180,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -8249,26 +8201,26 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "Tekstdosieroj (*.txt)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Æu vi estas certa pri forigo de '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Æu vi estas certa pri forigo de æi tiuj %1 komponantoj?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Konfirmu forigon de dosiero"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8278,7 +8230,7 @@ msgstr ""
 "Dosiero estas jam ekzistanta.\n"
 "Æu vi volas superskribi øin?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8288,12 +8240,12 @@ msgstr ""
 "Dosiero estas jam ekzistanta.\n"
 "Æu vi volas superskribi øin?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Konfirmu supreskribiton de dosieron"
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8310,7 +8262,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 #, fuzzy
 msgid "Wine License"
 msgstr "Wine Helpanto"
@@ -10780,10 +10732,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13401,10 +13349,6 @@ msgstr "&Legosigno"
 msgid "&Define..."
 msgstr "&Difinu..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "History"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 #, fuzzy
 msgid "Fonts"
diff --git a/po/es.po b/po/es.po
index b8ea548e44e..e7892b6aa88 100644
--- a/po/es.po
+++ b/po/es.po
@@ -62,8 +62,8 @@ msgstr "Información de Soporte"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -147,7 +147,7 @@ msgstr "&Instalar"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -187,7 +187,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "No especificado"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Nombre"
 
@@ -2556,7 +2556,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Descripción"
 
@@ -8065,51 +8065,51 @@ msgstr "S&alir"
 msgid "&About Control Panel"
 msgstr "&Acerca de Panel de Control..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Explorar carpeta"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Carpeta:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Hacer nueva carpeta"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Mensaje"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Sí"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Sí a &todo"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&No"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Licencia de Wine"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Ejecutándose en %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine le ha sido proporcionado por:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -8117,11 +8117,11 @@ msgstr ""
 "Introduzca el nombre de un programa, carpeta, documento o recurso de "
 "Internet; y Wine lo abrirá para usted."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Abrir:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Examinar"
@@ -8200,11 +8200,11 @@ msgstr "Apagar"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "¿Desea terminar su sesión de Wine?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Menú Inicio\\Programas"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programas"
 
-#: shell32.rc:200
+#: shell32.rc:201
 #, fuzzy
 msgid "My Documents"
 msgstr ""
@@ -8213,139 +8213,104 @@ msgstr ""
 "#-#-#-#-#  es.po (Wine)  #-#-#-#-#\n"
 "Mis Documentos"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Menú Inicio\\Programas\\Inicio"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recientes"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Enviar a"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Menú Inicio"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Mi música"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Mis vídeos"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Entorno de red"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Plantillas"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Datos de programa"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Vecindario de impresión"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Configuración local\\Datos de programa"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Historial"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Configuración local\\Archivos temporales de Internet"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Configuración local\\Historial"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Archivos de programa"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Mis imágenes"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Archivos de programa\\Archivos comunes"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Copiando archivos..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documentos"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Menú Inicio\\Programas\\Accesorios\\Herramientas del sistema"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Documentos\\Mi música"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Documentos\\Mis imágenes"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Documentos\\Mis vídeos"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Configuración local\\Datos de programa\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 #, fuzzy
 msgid "Program Files (x86)"
 msgstr "Archivos de programa"
 
 #: shell32.rc:221
 #, fuzzy
-msgid "Program Files (x86)\\Common Files"
-msgstr "Archivos de programa\\Archivos comunes"
-
-#: shell32.rc:228
-#, fuzzy
 msgid "Contacts"
 msgstr "&Contenido"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Enlaces"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
+#: shell32.rc:224
 #, fuzzy
-msgid "Downloads"
-msgstr "Descargando..."
+msgid "Playlists"
+msgstr "&Reproducir"
 
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
@@ -8359,56 +8324,43 @@ msgstr "Ubicación"
 msgid "Model"
 msgstr "Modelo"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Ejemplo"
+
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
+msgstr "G&uardar imagen como..."
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "Guardar &vídeo como..."
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "Guardar &como..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "&Buscar"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
+#: shell32.rc:233
 #, fuzzy
-msgid "OEM Links"
-msgstr "Enlaces"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr ""
+msgid "Downloads"
+msgstr "Descargando..."
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8487,11 +8439,11 @@ msgstr ""
 "de la carpeta seleccionada, éstos serán reemplazados. ¿Todavía desea mover\n"
 "o copiar la carpeta?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Nueva carpeta"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Panel de Control de Wine"
 
@@ -8508,27 +8460,27 @@ msgstr "No se puede mostrar el cuadro de diálogo Examinar (error interno)"
 msgid "Executable files (*.exe)"
 msgstr "Archivos ejecutables (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 "No hay un programa de Windows configurado para abrir este tipo de archivo."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "¿Seguro que desea eliminar '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "¿Seguro que desea eliminar estos %1 elementos?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Confirmar eliminación de archivo"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8538,7 +8490,7 @@ msgstr ""
 "El archivo ya existe.\n"
 "¿Desea reemplazarlo?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8548,12 +8500,12 @@ msgstr ""
 "El archivo ya existe.\n"
 "¿Desea reemplazarlo?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Confirmar sobreescritura de archivo"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8587,7 +8539,7 @@ msgstr ""
 "\n"
 "Mire el archivo COPYING.LIB para información sobre la licencia.\n"
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Licencia de Wine"
 
@@ -11430,10 +11382,6 @@ msgstr ""
 "Guarde el grupo como `%s' para prevenir la sobreescritura de los archivos "
 "originales."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programas"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Librarías (*.dll)"
@@ -14143,10 +14091,6 @@ msgstr "&Marcador"
 msgid "&Define..."
 msgstr "&Definir..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Historial"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Fuentes"
diff --git a/po/fa.po b/po/fa.po
index 0fc6a5af69f..e88337d4059 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -58,8 +58,8 @@ msgstr "اطلاعات"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -137,7 +137,7 @@ msgstr ""
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -173,7 +173,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2521,7 +2521,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7688,63 +7688,63 @@ msgstr "&خروج"
 msgid "&About Control Panel"
 msgstr "&درباره نت‌پد"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr ""
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr ""
 
-#: shell32.rc:329
+#: shell32.rc:316
 #, fuzzy
 msgid "About %s"
 msgstr "&درباره نت‌پد"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 #, fuzzy
 msgid "&Open:"
 msgstr "&باز‌کردن...\tCtrl+O"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7825,143 +7825,108 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
-
-#: shell32.rc:200
-msgid "My Documents"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
 #: shell32.rc:201
-msgid "Favorites"
+msgid "My Documents"
 msgstr ""
 
 #: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
+msgid "Favorites"
 msgstr ""
 
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr ""
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr ""
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 #, fuzzy
 msgid "My Pictures"
 msgstr "ذخیره &به نام..."
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr ""
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "&محتویات"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 #, fuzzy
 msgid "Contacts"
 msgstr "&محتویات"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7977,54 +7942,40 @@ msgstr "اطلاعات"
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+msgid "Sample Music"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
+msgstr "ذخیره &به نام..."
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "ذخیره &به نام..."
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "ذخیره &به نام..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "&جست‌و‌جو"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -8092,11 +8043,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -8113,23 +8064,23 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "پرونده‌های متنی (*.txt)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8140,7 +8091,7 @@ msgstr ""
 "\n"
 "آیا می‌خواهید یک پرونده‌ی جدید ایجاد کنید؟"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8151,11 +8102,11 @@ msgstr ""
 "\n"
 "آیا می‌خواهید یک پرونده‌ی جدید ایجاد کنید؟"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8172,7 +8123,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -10602,10 +10553,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13166,10 +13113,6 @@ msgstr ""
 msgid "&Define..."
 msgstr ""
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 #, fuzzy
 msgid "Fonts"
diff --git a/po/fi.po b/po/fi.po
index fc4f92847df..18a3db3f169 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -68,8 +68,8 @@ msgstr ""
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -154,7 +154,7 @@ msgstr "Asenna &teema..."
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -193,7 +193,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Nimi"
 
@@ -2545,7 +2545,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -7935,61 +7935,61 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr "Ti&etoja Ohjauspaneelista..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Valitse kansio"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Kansio:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Luo uusi kansio"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Viesti"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Kyllä"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Kyllä k&aikkiin"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Ei"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Tietoja ohjelmasta %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Winen &lisenssi"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Käytössä on versio %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Winen ovat tehneet:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr "Anna ohjelma, dokumentti tai Internet-osoite, niin Wine avaa sen."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Avaa:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Selaa..."
@@ -8068,144 +8068,112 @@ msgstr "Sammuta"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Haluatko lopettaa Wine-istunnon?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Käynnistä-valikko\\Ohjelmat"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr ""
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Omat tiedostot"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Suosikit"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Käynnistä-valikko\\Ohjelmat\\Käynnistys"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Äskettäin käytetyt"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Lähetä"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Käynnistä-valikko"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Omat musiikkitiedostot"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Omat videotiedostot"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Työpöytä"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Verkkoympäristö"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Mallit"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Ohjelmien tiedot"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Tulostinympäristö"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Paikalliset asetukset\\Ohjelmien tiedot"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Paikalliset asetukset\\Väliaikaiset Internet-tiedostot"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Evästeet"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Paikalliset asetukset\\Historia"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Ohjelmatiedostot"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Omat kuvatiedostot"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Ohjelmatiedostot\\Yhteiset tiedostot"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Kopioidaan Tiedostoja..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Tiedostot"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Käynnistä-valikko\\Ohjelmat\\Hallintatyökalut"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Musiikki"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Videot"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Paikalliset asetukset\\Ohjelmien tiedot\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Ohjelmatiedostot (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Ohjelmatiedostot (x86)\\Yhteiset tiedostot"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Kontaktit"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Linkit"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Kuvat\\Diaesitykset"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Musiikki\\Soittolistat"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Lataukset"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Tila"
@@ -8218,53 +8186,41 @@ msgstr "Sijainti"
 msgid "Model"
 msgstr "Malli"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Libraries"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Soittoäänet"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Musiikki\\Esimerkkimusiikki"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Kuvat\\Esimerkkikuvat"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Musiikki\\Esimerkkisoittolistat"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Videot\\Esimerkkivideot"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Tallennetut pelit"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Haut"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Links"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Lataukset"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8341,11 +8297,11 @@ msgstr ""
 "Jos kohdekansiossa on samannimisiä tiedostoja kuin valitussa kansiossa,\n"
 "ne korvataan uusilla. Jatketaanko?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Uusi kansio"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Winen Ohjauspaneeli"
 
@@ -8361,27 +8317,27 @@ msgstr "Selaa-valintaikkunaa ei voida näyttää (sisäinen virhe)"
 msgid "Executable files (*.exe)"
 msgstr "Suoritettavat tiedostot (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 "Tämän tiedostotyypin avaamiseen ei ole kytketty mitään Windows-ohjelmaa."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Haluatko varmasti tuhota kohteen '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Haluatko varmasti tuhota nämä %1?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Vahvista tiedoston tuhoaminen"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8391,7 +8347,7 @@ msgstr ""
 "Tiedosto on jo olemassa.\n"
 "Haluatko ylikirjoitaa sen?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8401,12 +8357,12 @@ msgstr ""
 "Tiedosto on jo olemassa.\n"
 "Haluatko ylikirjoitaa sen?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Vahvista tiedoston ylikirjoitus"
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8423,7 +8379,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Winen lisenssi"
 
@@ -10899,10 +10855,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13532,10 +13484,6 @@ msgstr "&Kirjanmerkki"
 msgid "&Define..."
 msgstr "&Aseta..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Fontit"
diff --git a/po/fr.po b/po/fr.po
index f8a740d0dfc..b5ac1982386 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -61,8 +61,8 @@ msgstr "Informations de support"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -146,7 +146,7 @@ msgstr "&Installer"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -187,7 +187,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Non spécifié"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Nom"
 
@@ -2537,7 +2537,7 @@ msgstr "Utilisation complémentaire de la clé (propriété)"
 msgid "Friendly name"
 msgstr "Nom convivial"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Description"
 
@@ -7741,51 +7741,51 @@ msgstr "&Quitter"
 msgid "&About Control Panel"
 msgstr "À &propos du panneau de configuration"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Parcourir les dossiers"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Dossier :"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Nouveau dossier"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Message"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Oui"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Oui pour &tous"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Non"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "À propos de %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Licence de Wine"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Exécuté avec %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine est une réalisation de :"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7793,11 +7793,11 @@ msgstr ""
 "Entrez le nom d'un programme, d'un dossier, d'un document ou d'une ressource "
 "Internet, et Wine l'ouvrira pour vous."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Ouvrir :"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Parcourir..."
@@ -7875,143 +7875,111 @@ msgstr "Arrêter"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Voulez-vous clôturer la session Wine ?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Menu Démarrer\\Programmes"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programmes"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Mes documents"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favoris"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Menu Démarrer\\Programmes\\Démarrage"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Documents récents"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Envoyer vers"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Menu Démarrer"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Ma musique"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Mes vidéos"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Bureau"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Voisinage réseau"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Modèles"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Voisinage d'impression"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Historique"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\Historique"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Mes images"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Fichiers communs"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Nom commun"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documents"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Menu Démarrer\\Programmes\\Outils d'administration"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Musique"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Images"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Vidéos"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Program Files (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files (x86)\\Fichiers communs"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Contacts"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Liens"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Images\\Diaporamas"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Musique\\Listes de lecture"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Téléchargements"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Statut"
@@ -8024,53 +7992,41 @@ msgstr "Emplacement"
 msgid "Model"
 msgstr "Modèle"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Bibliothèques"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Sonneries"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Musique\\Échantillons"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Images\\Échantillons"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Musique\\Exemples de listes de lecture"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Vidéos\\Échantillons"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Jeux sauvegardés"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Recherches"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "Liens OEM"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Téléchargements"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8150,11 +8106,11 @@ msgstr ""
 "sélectionné, ils seront écrasés. Voulez-vous quand même déplacer ou copier\n"
 "le dossier ?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Nouveau dossier"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Panneau de configuration de Wine"
 
@@ -8172,24 +8128,24 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "Fichiers exécutables (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 "Aucun programme Windows n'est configuré pour ouvrir ce type de fichier."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Voulez-vous réellement supprimer définitivement « %1 » ?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Voulez-vous réellement supprimer définitivement ces %1 éléments ?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "Confirmez la suppression"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8199,7 +8155,7 @@ msgstr ""
 "\n"
 "Voulez-vous le remplacer ?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8209,11 +8165,11 @@ msgstr ""
 "\n"
 "Voulez-vous le remplacer ?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "Confirmez l'écrasement"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8244,7 +8200,7 @@ msgstr ""
 "GNU avec Wine ; si ce n’est pas le cas, écrivez à la : Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Licence de Wine"
 
@@ -11086,10 +11042,6 @@ msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 "Groupe enregistré sous « %s » pour éviter l'écrasement du fichier original."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programmes"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Bibliothèques (*.dll)"
@@ -13743,10 +13695,6 @@ msgstr "&Signets"
 msgid "&Define..."
 msgstr "&Définir..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Historique"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Polices"
diff --git a/po/he.po b/po/he.po
index 7672b986245..a6107c8850f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -63,8 +63,8 @@ msgstr "פרטי תמיכה"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -145,7 +145,7 @@ msgstr "ה&תקנה"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -184,7 +184,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "לא מוגדר"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "שם"
 
@@ -2527,7 +2527,7 @@ msgstr "שימוש במפתח מורחב (מאפיין)"
 msgid "Friendly name"
 msgstr "שם ידידותי"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "תיאור"
 
@@ -7945,51 +7945,51 @@ msgstr "י&ציאה"
 msgid "&About Control Panel"
 msgstr "על &אודות לוח הבקרה"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "עיון אחר תיקייה"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "תיקייה:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "י&צירת תיקייה חדשה"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "הודעה"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&כן"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "כ&ן להכול"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&לא"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "על אודות %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "ה&רישיון של Wine"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "פועל על גבי %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine מוגשת לך על ידי:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7997,11 +7997,11 @@ msgstr ""
 "נא להזין את שם התכנית, התיקייה, המסמך או משאב האינטרנט ו־Wine תפתח אותם "
 "עבורך."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&פתיחה:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&עיון"
@@ -8079,143 +8079,111 @@ msgstr "כיבוי"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "האם ברצונך לכבות את הפעלת ה־Wine שלך?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "תפריט ההתחלה\\תכניות"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr ""
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "המסמכים שלי"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "מועדפים"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "תפריט ההתחלה\\תכניות\\הפעלה"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "אחרונים"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "שליחה אל"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "תפריט ההתחלה"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "המוזיקה שלי"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "הווידאו שלי"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "שולחן העבודה"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "שכנים ברשת"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "תבניות"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "הדפסה ברשת"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "היסטוריה"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "התמונות שלי"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "העתקת קבצים..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "מסמכים"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "תפריט ההתחלה\\תכניות\\כלי ניהול"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "מוזיקה"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "תמונות"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "וידאו"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Program Files (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files (x86)\\Common Files"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "אנשי קשר"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "קישורים"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "תמונות\\מצגות"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "מוזיקה\\רשימות השמעה"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "הורדות"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "מצב"
@@ -8228,53 +8196,41 @@ msgstr "מיקום"
 msgid "Model"
 msgstr "דגם"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Libraries"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Ringtones"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "מוזיקה\\מוזיקה לדוגמה"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "תמונות\\תמונות לדוגמה"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "מוזיקה\\רשימות השמעה לדוגמה"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "וידאו\\קטעי וידאו לדוגמה"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "משחקים שמורים"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "חיפושים"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "משתמשים"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Links"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "הורדות"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8348,11 +8304,11 @@ msgstr ""
 "אם לקבצים בתיקייה היעד יש את אותם השמות כמו לקבצים שבתיקייה\n"
 "הנבחרת הם יוחלפו. האם ברצונך להעביר או להעתיק את התיקייה?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "תיקייה חדשה"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "לוח הבקרה של Wine"
 
@@ -8368,26 +8324,26 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "קובצי הפעלה (‎*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "אין תכנית Windows המוגדרת לפתיחת סוג כזה של קבצים."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "האם אכן ברצונך למחוק את '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "האם אכן ברצונך למחוק %1 פריטים אלה?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "אישור מחיקת קובץ"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8397,7 +8353,7 @@ msgstr ""
 "הקובץ כבר קיים.\n"
 "האם ברצונך להחליף אותו?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8407,12 +8363,12 @@ msgstr ""
 "הקובץ כבר קיים.\n"
 "האם ברצונך להחליף אותו?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "אישור שכתוב על קובץ"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8441,7 +8397,7 @@ msgstr ""
 "שלא כך הדבר, באפשרותך לכתוב אל Free Software Foundation, Inc., 51 Franklin "
 "St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "הרישיון של Wine"
 
@@ -11059,10 +11015,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13782,10 +13734,6 @@ msgstr "&סימניה"
 msgid "&Define..."
 msgstr "ה&גדרה..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "היסטוריה"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "גופנים"
diff --git a/po/hi.po b/po/hi.po
index 3281c1d1e19..a6f47b93302 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -57,8 +57,8 @@ msgstr ""
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -134,7 +134,7 @@ msgstr ""
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -170,7 +170,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2471,7 +2471,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7574,62 +7574,62 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr "क्लॉक के बारे में (&A)..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr ""
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr ""
 
-#: shell32.rc:329
+#: shell32.rc:316
 #, fuzzy
 msgid "About %s"
 msgstr "क्लॉक के बारे में (&A)..."
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr ""
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7707,141 +7707,105 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
-
-#: shell32.rc:200
-msgid "My Documents"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
 #: shell32.rc:201
-msgid "Favorites"
+msgid "My Documents"
 msgstr ""
 
 #: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
+msgid "Favorites"
 msgstr ""
 
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr ""
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr ""
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
+#: shell32.rc:215
+msgid "Common Files"
 msgstr ""
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr ""
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7856,52 +7820,36 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+msgid "Sample Music"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:228
+msgid "Sample Videos"
 msgstr ""
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr ""
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr ""
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -7969,11 +7917,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -7989,41 +7937,41 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr ""
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8040,7 +7988,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -10432,10 +10380,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -12945,10 +12889,6 @@ msgstr ""
 msgid "&Define..."
 msgstr ""
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 #, fuzzy
 msgid "Fonts"
diff --git a/po/hu.po b/po/hu.po
index ef54f7c33f8..c0984369eb2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -62,8 +62,8 @@ msgstr "Támogatási információ"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -147,7 +147,7 @@ msgstr "&Telepítés"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -188,7 +188,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Nincs megadva"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Név"
 
@@ -2591,7 +2591,7 @@ msgstr "Kibővített kulcs használat"
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Leírás"
 
@@ -8089,51 +8089,51 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr "&Vezérlőpult névjegye..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Mappa tallózása"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Mappa:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Új mappa létrehozása"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Üzenet"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Igen"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "&Összesre igen"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Nem"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "%s névjegye"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Wine &licensz"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Ezen fut: %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "A Wine-t készítették:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -8141,11 +8141,11 @@ msgstr ""
 "Írjon be programot, mappát, dokumentumot, Internetes erőforrást és a Wine "
 "megnyitja Önnek."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Megnyitás:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Tallózás..."
@@ -8229,11 +8229,11 @@ msgstr "Leállítás"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Le szeretné állítani a Wine munkamenetét?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Start Menu\\Programs"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programok"
 
-#: shell32.rc:200
+#: shell32.rc:201
 #, fuzzy
 msgid "My Documents"
 msgstr ""
@@ -8242,139 +8242,104 @@ msgstr ""
 "#-#-#-#-#  hu.po (Wine)  #-#-#-#-#\n"
 "Dokumentumok"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favorites"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Start Menu\\Programs\\StartUp"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recent"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Start Menu"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "My Music"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "My Videos"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Asztal"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "NetHood"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Templates"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "PrintHood"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "My Pictures"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Egyszerű név"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documents"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start Menu\\Programs\\Administrative Tools"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Music"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Pictures"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Videos"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 #, fuzzy
 msgid "Program Files (x86)"
 msgstr "Program Files"
 
 #: shell32.rc:221
 #, fuzzy
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files\\Common Files"
-
-#: shell32.rc:228
-#, fuzzy
 msgid "Contacts"
 msgstr "&Tartalom"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
+#: shell32.rc:224
 #, fuzzy
-msgid "Downloads"
-msgstr "Letöltés..."
+msgid "Playlists"
+msgstr "lista"
 
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
@@ -8388,56 +8353,43 @@ msgstr "Hely"
 msgid "Model"
 msgstr "Modell"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Minta"
+
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
+msgstr "&Kép mentése..."
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "&Video mentése..."
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "Mentés má&sként..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "&Keresés"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
+#: shell32.rc:233
 #, fuzzy
-msgid "OEM Links"
-msgstr "&Link megnyitása"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr ""
+msgid "Downloads"
+msgstr "Letöltés..."
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8514,11 +8466,11 @@ msgstr ""
 "akkor le lesznek cserélve. Még mindig folytatni szeretné a mappa\n"
 "másolását vagy áthelyezését?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Új mappa"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine vezérlőpult"
 
@@ -8534,26 +8486,26 @@ msgstr "Nem tudom megjeleníteni a tallózás dialógusablakot (belső hiba)"
 msgid "Executable files (*.exe)"
 msgstr "Futtatható fájlok (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "Nincs Windowsos program társítva ennek a fájltípusnak a megnyitásához."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Biztos hogy törölni szeretné ezt: '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Biztos hogy törölni szeretné ezt a(z) %1 elemet?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Fájl törlési megerősítés"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8563,7 +8515,7 @@ msgstr ""
 "A fájl már létezik.\n"
 "Cseréli a fájlt?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8573,12 +8525,12 @@ msgstr ""
 "A fájl már létezik.\n"
 "Cseréli a fájlt?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Fájl felülírási megerősítés"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8609,7 +8561,7 @@ msgstr ""
 "ha nem írjon a Free Software Foundation, Inc-nek: 51 Franklin St, Fifth "
 "Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine Licensz"
 
@@ -11124,10 +11076,6 @@ msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 "%s csoport mentése másként, megakadályozza az eredeti fájlok felülírását."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programok"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Eljáráskönyvtár (*.dll)"
@@ -13793,10 +13741,6 @@ msgstr "&Könyvjelző"
 msgid "&Define..."
 msgstr "&Definiálás..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Betûtípusok"
diff --git a/po/it.po b/po/it.po
index e052f38d841..7fa1ddf538f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -61,8 +61,8 @@ msgstr "Informazioni di supporto"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -146,7 +146,7 @@ msgstr "&Installa"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Non specificato"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Nome"
 
@@ -2532,7 +2532,7 @@ msgstr "Uso delle chiavi avanzate (proprietà)"
 msgid "Friendly name"
 msgstr "Nome amichevole"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Descrizione"
 
@@ -7727,51 +7727,51 @@ msgstr "&Esci"
 msgid "&About Control Panel"
 msgstr "&Informazioni sul Pannello di controllo"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Sfoglia cartelle"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Cartella:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Nuova cartella"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Messaggio"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Sì"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Sì a &tutti"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&No"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Informazioni su %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Licenza di Wine"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "In esecuzione su %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine è disponibile grazie a:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7779,11 +7779,11 @@ msgstr ""
 "Digitare il nome del programma, della cartella, del documento o della "
 "risorsa internet, e Wine la aprirà."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Apri:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Naviga..."
@@ -7861,143 +7861,111 @@ msgstr "Termina sessione"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Vuoi terminare la sessione di Wine?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Menu Start\\Programmi"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programmi"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Documenti"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favoriti"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Menu Start\\Programmi\\Esecuzione automatica"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recenti"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Invia A"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Menu Start"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Musica"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Video"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Scrivania"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Reti condivise"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Modelli"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Applicazioni"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Stampanti condivise"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Impostazioni locali\\Applicazioni"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Cronologia"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Impostazioni locali\\File Internet Temporanei"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookie"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Impostazioni locali\\Cronologia"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Programmi"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Immagini"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Programmi\\File Comuni"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Nome comune"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documenti"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start Menu\\Programmi\\Strumenti di amministrazione"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Documenti\\Musica"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Documenti\\Immagini"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Documenti\\Video"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Impostazioni locali\\Applicazioni\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Programmi (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Programmi (x86)\\File Comuni"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Contatti"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Collegamenti"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Immagini\\Slide Shows"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Musica\\Playlists"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Download"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Stato"
@@ -8010,53 +7978,41 @@ msgstr "Locazione"
 msgid "Model"
 msgstr "Modello"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Librerie"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Suonerie"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Musica\\Sample Music"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Immagini\\Sample Pictures"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Musica\\Sample Playlists"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Video\\Sample Videos"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Giochi salvati"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Ricerche"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Utenti"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "Collegamenti OEM"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "Applicazioni\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Download"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8134,11 +8090,11 @@ msgstr ""
 "cartella selezionata, saranno sostituiti. Vuoi spostare o copiare\n"
 "la cartella?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Nuova cartella"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Pannello di controllo di Wine"
 
@@ -8154,24 +8110,24 @@ msgstr "Impossibile mostrare la finestra Sfoglia (errore interno)"
 msgid "Executable files (*.exe)"
 msgstr "File eseguibili (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 "Non c'è un programma Windows configurato per aprire questo tipo di file."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Sei sicuro di voler cancellare '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Sei sicuro di voler cancellare questi %1 elementi?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "Confermare l'eliminazione del file"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8181,7 +8137,7 @@ msgstr ""
 "\n"
 "Sostituirlo?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8191,11 +8147,11 @@ msgstr ""
 "\n"
 "Sostituirla?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "Confermare la sovrascrittura del file"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8226,7 +8182,7 @@ msgstr ""
 "insieme a questo programma; altrimenti, scrivi alla Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Licenza di Wine"
 
@@ -11028,10 +10984,6 @@ msgstr "Il file `%s' esiste. Non sovrascritto."
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Salvare il gruppo come `%s' per non sovrascrivere i file originali."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programmi"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Librerie (*.dll)"
@@ -13671,10 +13623,6 @@ msgstr "&Segnalibro"
 msgid "&Define..."
 msgstr "&Definisci..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Cronologia"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Caratteri"
diff --git a/po/ja.po b/po/ja.po
index df4c96aefa6..5b4a02db979 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -62,8 +62,8 @@ msgstr "サポート情報"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -145,7 +145,7 @@ msgstr "インストール(&I)"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "指定されていません"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "名前"
 
@@ -2520,7 +2520,7 @@ msgstr "拡張鍵の使用法 (プロパティ)"
 msgid "Friendly name"
 msgstr "フレンドリ名"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "説明"
 
@@ -7702,51 +7702,51 @@ msgstr "終了(&X)"
 msgid "&About Control Panel"
 msgstr "バージョン情報(&A)..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "フォルダの参照"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "フォルダ:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "新しいフォルダの作成(&M)"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "メッセージ"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "はい(&Y)"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "すべてはい(&A)"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "いいえ(&N)"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "%s について"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Wine ライセンス(&L)"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7754,11 +7754,11 @@ msgstr ""
 "実行するプログラムまたは、開くフォルダ名や ドキュメント名、 インターネット リ"
 "ソース名を入力してください。"
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "名前(&O):"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "参照(&B)..."
@@ -7836,143 +7836,111 @@ msgstr "シャットダウン"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Wine セッションをシャットダウンしますか?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Start Menu\\Programs"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "プログラム"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "My Documents"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favorites"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Start Menu\\Programs\\StartUp"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recent"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Start Menu"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "My Music"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "My Videos"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Desktop"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "NetHood"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Templates"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "PrintHood"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "履歴"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "My Pictures"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "ファイルをコピーしています..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documents"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start Menu\\Programs\\Administrative Tools"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Music"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Pictures"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Videos"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Program Files (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files (x86)\\Common Files"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Contacs"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Links"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Pictures\\Slide Shows"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Music\\Playlists"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Downloads"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "状態"
@@ -7985,53 +7953,41 @@ msgstr "場所"
 msgid "Model"
 msgstr "機種名"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Libraries"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Ringtones"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Music\\Sample Music"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Pictures\\Sample Pictures"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Music\\Sample Playlists"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Videos\\Sample Videos"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Saved Games"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Searches"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Users"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Links"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Downloads"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8106,11 +8062,11 @@ msgstr ""
 "同じ名前のファイルがある場合、新しいファイルで上書きされます。\n"
 "フォルダの移動またはコピーを続けますか?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "新しいフォルダ"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine コントロール パネル"
 
@@ -8126,23 +8082,23 @@ msgstr "[参照]ダイアログを表示できません (内部エラー)"
 msgid "Executable files (*.exe)"
 msgstr "実行可能ファイル (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "このファイルの種類に関連付けられた Windows プログラムはありません。"
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "'%1' を完全に削除しますか?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "これら %1 項目を完全に削除しますか?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "削除の確認"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8152,7 +8108,7 @@ msgstr ""
 "\n"
 "既存のファイルを置き換えますか?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8162,11 +8118,11 @@ msgstr ""
 "\n"
 "既存のフォルダを置き換えますか?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "上書きの確認"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8197,7 +8153,7 @@ msgstr ""
 "い(宛先は the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, "
 "Boston, MA 02110-1301, USA)。"
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine ライセンス"
 
@@ -10959,10 +10915,6 @@ msgstr "`%s' が存在します。上書きしません。"
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "元のファイルを上書きしないため、グループを `%s' として保存しました。"
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "プログラム"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "ライブラリ (*.dll)"
@@ -13588,10 +13540,6 @@ msgstr "しおり(&B)"
 msgid "&Define..."
 msgstr "定義(&D)..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "履歴"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "フォント"
diff --git a/po/ko.po b/po/ko.po
index 70570f63233..512840bb934 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -60,8 +60,8 @@ msgstr "지원 정보"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -143,7 +143,7 @@ msgstr "설치(&I)"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -183,7 +183,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "지정되지 않음"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "이름"
 
@@ -2514,7 +2514,7 @@ msgstr "확장 키 사용 (속성)"
 msgid "Friendly name"
 msgstr "애칭"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "설명"
 
@@ -7693,62 +7693,62 @@ msgstr "끝내기(&X)"
 msgid "&About Control Panel"
 msgstr "제어판 정보(&A)"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "폴더 탐색"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "폴더:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "새 폴더 만들기(&M)"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "메시지"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "예(&Y)"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "모두 예(&A)"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "아니오(&N)"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr " %s 정보"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Wine 라이센스(&l)"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "%s 실행중"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine 에 도움주신 분:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 "풀그림,폴더,문서나 인터넷 자원, 그리고 Wine이 열  것의 이름을 적어주세요."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "열기(&O):"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "찾기(&B)"
@@ -7826,143 +7826,111 @@ msgstr "끄기"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "당신은 Wine 세션을 끄겠습니까?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "시작 메뉴\\프로그램"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "풀그림"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "내 문서"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "즐겨찾기"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "시작 메뉴\\프로그램\\시작 프로그램"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "최근 파일"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "보내기"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "시작 메뉴"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "내 음악"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "내 비디오"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "바탕화면"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "네트워크 환경"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Templates"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "네트워크 환경"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "기록"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "내 그림"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "완전한 이름"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "문서"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "시작메뉴\\프로그램\\관리 도구"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "내 음악"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "내 그림"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "내 비디오"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Program Files (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files (x86)\\Common Files"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Contacts"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "링크"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Pictures\\Slide Shows"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Music\\Playlists"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "다운로드"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "상태"
@@ -7975,53 +7943,41 @@ msgstr "위치"
 msgid "Model"
 msgstr "모델"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Libraries"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Ringtones"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Music\\Sample Music"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Pictures\\Sample Pictures"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Music\\Sample Playlists"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Videos\\Sample Videos"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Saved Games"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Searches"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Users"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Links"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "다운로드"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8096,11 +8052,11 @@ msgstr ""
 "다\n"
 " 대체될 것입니다. 당신은 이 폴더를 이동시키거나 복사하겠습니까?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "새 폴더"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine 제어판"
 
@@ -8116,23 +8072,23 @@ msgstr "찾기 대화 상자를 보여 줄 수 없습니다(내부 오류)"
 msgid "Executable files (*.exe)"
 msgstr "실행 파일 (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "이 형식의 파일을 도록 구성된 윈도우 프로그램이 없습니다."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "당신은  '%1'을 완전히 지우기를 바랍니까?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "당신은 %1 아이템(들)을 완전히 지우기를 바랍니까?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "삭제 확인"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8141,7 +8097,7 @@ msgstr ""
 "경로 %1에 파일은 이미 존재합니다.\n"
 "바꾸기를 원합니까?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8150,11 +8106,11 @@ msgstr ""
 "경로 %1에 폴더 이미 존재합니다.\n"
 "바꾸기를 원합니까?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "덮어쓰기 확인"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8184,7 +8140,7 @@ msgstr ""
 "니다; 그렇지 않으면 자유 소프트웨어 재단 주식회사 , 51 Franklin St, Fifth "
 "Floor, Boston, MA 02110-1301, USA에 편지를 보내십시오."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine 라이센스"
 
@@ -10918,10 +10874,6 @@ msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 "`%s를 다른 이름으로 저장해야 원래 파일을 덮어 쓰는 걸 막을 수 있습니다."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "풀그림"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "라이브러리 파일(*.dll)"
@@ -13524,10 +13476,6 @@ msgstr "책갈피(&B)"
 msgid "&Define..."
 msgstr "정의(&D)..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "기록"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "글꼴"
diff --git a/po/lt.po b/po/lt.po
index 5b582de38d1..32f364956d4 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -63,8 +63,8 @@ msgstr "Priežiūros informacija"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -145,7 +145,7 @@ msgstr "&Įdiegti"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Nenurodyta"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Vardas"
 
@@ -2526,7 +2526,7 @@ msgstr "Ypatingas rakto naudojimas (savybė)"
 msgid "Friendly name"
 msgstr "Draugiškas vardas"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Aprašas"
 
@@ -7718,51 +7718,51 @@ msgstr "Iš&eiti"
 msgid "&About Control Panel"
 msgstr "&Apie valdymo skydelį"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Parinkti aplanką"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Aplankas:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Kurti naują aplanką"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Pranešimas"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Taip"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Taip &visiems"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Ne"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Apie %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Wine &licencija"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Paleista su %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Prie Wine kūrimo prisidėjo:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7770,11 +7770,11 @@ msgstr ""
 "Įrašykite programos pavadinimą, aplanką, dokumentą ar interneto resursą ir "
 "Wine jums jį atvers."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Atverti:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Parinkti..."
@@ -7852,143 +7852,111 @@ msgstr "Stabdyti"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Ar norite sustabdyti šį Wine seansą?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Pradžios meniu\\Programos"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programos"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Dokumentai"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Adresynas"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Pradžios meniu\\Programos\\Paleidimas"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Paskiausi"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Siųsti"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Pradžios meniu"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Muzika"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Vaizdai"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Darbalaukis"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Tinkle"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Šablonai"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Programų duomenys"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Spausdintuvai"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Vietinės nuostatos\\Programų duomenys"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Istorija"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Vietinės nuostatos\\Laikini interneto failai"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Slapukai"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Vietinės nuostatos\\Istorija"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Programų failai"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Paveikslai"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Programų failai\\Bendrieji failai"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Vardas, pavardė"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Dokumentai"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Pradžios meniu\\Programos\\Administravimo įrankiai"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Muzika"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Paveikslai"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Vaizdai"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Vietinės nuostatos\\Programų duomenys\\Microsoft\\CD rašymas"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Programų failai (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Programų failai (x86)\\Bendrieji failai"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Kontaktai"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Saitai"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Paveikslai\\Skaidrių peržiūros"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Muzika\\Grojaraščiai"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Atsiuntimai"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Būsena"
@@ -8001,53 +7969,41 @@ msgstr "Vieta"
 msgid "Model"
 msgstr "Modelis"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Bibliotekos"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Skambučių melodijos"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Muzika\\Muzikos pavyzdžiai"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Paveikslai\\Paveikslų pavyzdžiai"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Muzika\\Grojaraščių pavyzdžiai"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Vaizdai\\Vaizdų pavyzdžiai"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Išsaugoti žaidimai"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Paieškos"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Naudotojai"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM nuorodos"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "Programų duomenys\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Atsiuntimai"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8126,11 +8082,11 @@ msgstr ""
 "kopijuoti\n"
 "šį aplanką?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Naujas aplankas"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine valdymo skydelis"
 
@@ -8146,23 +8102,23 @@ msgstr "Nepavyko parodyti parinkimo dialogo lango (vidinė klaida)"
 msgid "Executable files (*.exe)"
 msgstr "Vykdomieji failai (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "Jokia Windows programa nėra sukonfigūruota atidaryti šio tipo failų."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Ar tikrai norite negrįžtamai pašalinti „%1“?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Ar tikrai norite negrįžtamai pašalinti šiuos %1 elementus?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "Patvirtinti šalinimą"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8172,7 +8128,7 @@ msgstr ""
 "\n"
 "Ar norite jį pakeisti?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8182,11 +8138,11 @@ msgstr ""
 "\n"
 "Ar norite jį pakeisti?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "Patvirtinti perrašymą"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8216,7 +8172,7 @@ msgstr ""
 "kartu su Wine; jei negavote, rašykite adresu Free Software Foundation, Inc., "
 "51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine licencija"
 
@@ -10979,10 +10935,6 @@ msgstr "Failas „%s“ egzistuoja. Neperrašytas."
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Išsaugoti grupę kaip „%s“, taip neperrašant originalių failų."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programos"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Bibliotekos (*.dll)"
@@ -13608,10 +13560,6 @@ msgstr "&Adresynas"
 msgid "&Define..."
 msgstr "&Apibrėžti..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Istorija"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Šriftai"
diff --git a/po/ml.po b/po/ml.po
index 79555c5dfdc..c47e9cfc885 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -57,8 +57,8 @@ msgstr ""
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -134,7 +134,7 @@ msgstr ""
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -170,7 +170,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2471,7 +2471,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7574,62 +7574,62 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr "ക്ലോക്കിനെപ്പറ്റി _അറിയുക..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr ""
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr ""
 
-#: shell32.rc:329
+#: shell32.rc:316
 #, fuzzy
 msgid "About %s"
 msgstr "ക്ലോക്കിനെപ്പറ്റി _അറിയുക..."
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr ""
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7707,141 +7707,105 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
-
-#: shell32.rc:200
-msgid "My Documents"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
 #: shell32.rc:201
-msgid "Favorites"
+msgid "My Documents"
 msgstr ""
 
 #: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
+msgid "Favorites"
 msgstr ""
 
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr ""
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr ""
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
+#: shell32.rc:215
+msgid "Common Files"
 msgstr ""
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr ""
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7856,52 +7820,36 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+msgid "Sample Music"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:228
+msgid "Sample Videos"
 msgstr ""
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr ""
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr ""
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -7969,11 +7917,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -7989,41 +7937,41 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr ""
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8040,7 +7988,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -10432,10 +10380,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -12945,10 +12889,6 @@ msgstr ""
 msgid "&Define..."
 msgstr ""
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 #, fuzzy
 msgid "Fonts"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 60283bd3c57..d8ef47786a1 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -61,8 +61,8 @@ msgstr "Støtteinformasjon"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -144,7 +144,7 @@ msgstr "&Installer"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -182,7 +182,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Ikke oppgitt"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Navn"
 
@@ -2615,7 +2615,7 @@ msgstr "Utvidet nøkkelbruk (egenskap)"
 msgid "Friendly name"
 msgstr "Vennlig navn"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -7969,51 +7969,51 @@ msgstr "&Avslutt"
 msgid "&About Control Panel"
 msgstr "&Om Kontrollpanel..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Bla etter mappe"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Mappe:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "Ny &mappe"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Meldings"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Ja"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Ja til &alt"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Nei"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Om %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Lisens"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Kjører på %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine er laget av"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -8021,11 +8021,11 @@ msgstr ""
 "Skriv inn navnet på programmet, mappen, dokumentet, eller Internett-"
 "ressursen du ønsker å åpne."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Åpne:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Bla"
@@ -8104,147 +8104,112 @@ msgstr "Avslutt"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Vil du avslutte Wine-økten?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Start-meny\\Programmer"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programmer"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Mine dokumenter"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favoritter"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Start-meny\\Programmer\\Oppstart"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Siste"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Start-meny"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Min musikk"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Mine videoklipp"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "NetHood"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Maler"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Programdata"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Skrivere"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Lokale innstillinger\\Programdata"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Historikk"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Lokale innstillinger\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Lokale innstillinger\\Logg"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Programfiler"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Mine bilder"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Programfiler\\Fellesfiler"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Vanlig navn"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Dokumenter"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start-meny\\Programmer\\Administrative verktøy"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Dokumenter\\Min musikk"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Dokumenter\\Mine bilder"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Dokumenter\\Mine videoklipp"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Lokale innstillinger\\Programdata\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 #, fuzzy
 msgid "Program Files (x86)"
 msgstr "Programfiler"
 
 #: shell32.rc:221
 #, fuzzy
-msgid "Program Files (x86)\\Common Files"
-msgstr "Programfiler\\Fellesfiler"
-
-#: shell32.rc:228
-#, fuzzy
 msgid "Contacts"
 msgstr "&Innhold"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Koblinger"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
+#: shell32.rc:224
 #, fuzzy
-msgid "Downloads"
-msgstr "Laster ned..."
+msgid "Playlists"
+msgstr "liste"
 
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
@@ -8258,35 +8223,26 @@ msgstr "Plassering"
 msgid "Model"
 msgstr "Modell"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Forhåndsvisning"
+
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
+msgstr "Lagre bilde &som..."
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "Lagre video &som..."
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr ""
@@ -8295,24 +8251,20 @@ msgstr ""
 "#-#-#-#-#  nb_NO.po (Wine)  #-#-#-#-#\n"
 "Lagre &som..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "&Søk"
 
-#: shell32.rc:242
+#: shell32.rc:231
 #, fuzzy
 msgid "Users"
 msgstr "Brukernavn"
 
-#: shell32.rc:243
+#: shell32.rc:233
 #, fuzzy
-msgid "OEM Links"
-msgstr "Koblinger"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr ""
+msgid "Downloads"
+msgstr "Laster ned..."
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8389,11 +8341,11 @@ msgstr ""
 "kopiere\n"
 "denne mappen?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Ny mappe"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine Kontrollpanel"
 
@@ -8409,26 +8361,26 @@ msgstr "Klarte ikke vise Bla gjennom-vinduet (intern feil)"
 msgid "Executable files (*.exe)"
 msgstr "Programfiler (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "Intet Windows-program er satt opp til å åpne denne filtypen."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Vil du virkelig slette «%1»?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Vil du virkelig slette disse %1 elementene?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Bekreft filsletting"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8438,7 +8390,7 @@ msgstr ""
 "Filen finnes fra før.\n"
 "Skal den overskrives?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8448,12 +8400,12 @@ msgstr ""
 "Filen finnes fra før.\n"
 "Skal den overskrives?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Bekreft overskriving av fil"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8483,7 +8435,7 @@ msgstr ""
 "sammen med dette programmet; hvis ikke, skriv til: the Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Lisensbetingelser"
 
@@ -11247,10 +11199,6 @@ msgstr "Filen '%s' fantes allerede, og ble ikke overskrevet."
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Lagre gruppe som '%s' for å unngå å overskrive filer."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programmer"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Biblioteker (*.dll)"
@@ -13943,10 +13891,6 @@ msgstr "&Bokmerke"
 msgid "&Define..."
 msgstr "&Definer..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Historikk"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 #, fuzzy
 msgid "Fonts"
diff --git a/po/nl.po b/po/nl.po
index bba77c5e95f..f2adb14454e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -62,8 +62,8 @@ msgstr "Support Informatie"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -146,7 +146,7 @@ msgstr "&Installeren"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Niet gespecificeerd"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Naam"
 
@@ -2532,7 +2532,7 @@ msgstr "Uitgebreid sleutel gebruik (eigenschap)"
 msgid "Friendly name"
 msgstr "Naam alias"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -7737,51 +7737,51 @@ msgstr "&Afsluiten"
 msgid "&About Control Panel"
 msgstr "&Over Configuratiescherm"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Bladeren naar map"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Map:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "Nieuwe &map maken"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Message"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Ja"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Ja op &alles"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Nee"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Info %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Wine &licentie"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Draait op %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine is geschreven door:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7789,11 +7789,11 @@ msgstr ""
 "Geef de naam van een programma, map, document, of Internet-adres op. Wine "
 "zal het vervolgens openen."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Openen:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Bladeren..."
@@ -7871,143 +7871,111 @@ msgstr "Afsluiten"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Wilt u uw Wine sessie afsluiten?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Start Menu\\Programma's"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programma's"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Mijn Documenten"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favorieten"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Start Menu\\Programma's\\Opstarten"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recent"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Start Menu"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Mijn Muziek"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Mijn Video's"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Bureaublad"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Netwerkomgeving"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Printeromgeving"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Geschiedenis"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Tijdelijke Internetbestanden"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\Geschiedenis"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Mijn Afbeeldingen"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Gemeenschappelijke Naam"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documenten"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start Menu\\Programma's\\Administratieve Tools"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Documenten\\Mijn Muziek"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Documenten\\Mijn Afbeeldingen"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Documenten\\Mijn Videos"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Applicatie Data\\Microsoft\\CD Branden"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Program Files (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files (x86)\\Common Files"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Contacten"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Links"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Afbeeldingen\\Diashows"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Muziek\\Afspeellijsten"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Downloads"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Status"
@@ -8020,53 +7988,41 @@ msgstr "Locatie"
 msgid "Model"
 msgstr "Model"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Libraries"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Ringtones"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Muziek\\Voorbeelden van muziek"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Afbeeldingen\\Voorbeelden van afbeeldingen"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Muziek\\Voorbeelden van afspeellijsten"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Video's\\Voorbeelden van video's"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Opgeslagen Spellen"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Zoekopdrachten"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Gebruikers"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Links"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Downloads"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8147,11 +8103,11 @@ msgstr ""
 "kopiëren\n"
 "of verplaatsen?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Nieuwe Map"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine Configuratiescherm"
 
@@ -8167,24 +8123,24 @@ msgstr "Fout tijdens tonen van Bladeren venster (interne fout)"
 msgid "Executable files (*.exe)"
 msgstr "Uitvoerbare bestanden (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 "Er is geen Windows-programma geconfigureerd om dit soort bestanden te openen."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Weet u zeker dat u '%1' permanent wilt verwijderen?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Weet u zeker dat u deze %1 bestanden permanent wilt verwijderen?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "Bevestig verwijderen"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8194,7 +8150,7 @@ msgstr ""
 "\n"
 "Wilt u het vervangen?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8204,11 +8160,11 @@ msgstr ""
 "\n"
 "Wilt u het vervangen?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "Bevestig overschrijven"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8242,7 +8198,7 @@ msgstr ""
 "\n"
 "Bekijk het COPYING.LIB bestand voor informatie over de licentie.\n"
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine Licentie"
 
@@ -11051,10 +11007,6 @@ msgstr ""
 "Groep opslaan als `%s om het overschrijven van originele bestanden te "
 "voorkomen."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programma's"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Programmabibliotheekbestanden (*.dll)"
@@ -13721,10 +13673,6 @@ msgstr "&Favorieten"
 msgid "&Define..."
 msgstr "&Aanmaken..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Geschiedenis"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Lettertype"
diff --git a/po/or.po b/po/or.po
index 53101a5952a..362fa05f407 100644
--- a/po/or.po
+++ b/po/or.po
@@ -57,8 +57,8 @@ msgstr ""
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -134,7 +134,7 @@ msgstr ""
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -170,7 +170,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2471,7 +2471,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7574,62 +7574,62 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr "ଘଡ଼ି ବିଷୟରେ (&A)..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr ""
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr ""
 
-#: shell32.rc:329
+#: shell32.rc:316
 #, fuzzy
 msgid "About %s"
 msgstr "ଘଡ଼ି ବିଷୟରେ (&A)..."
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr ""
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7707,141 +7707,105 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
-
-#: shell32.rc:200
-msgid "My Documents"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
 #: shell32.rc:201
-msgid "Favorites"
+msgid "My Documents"
 msgstr ""
 
 #: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
+msgid "Favorites"
 msgstr ""
 
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr ""
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr ""
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
+#: shell32.rc:215
+msgid "Common Files"
 msgstr ""
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr ""
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7856,52 +7820,36 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+msgid "Sample Music"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:228
+msgid "Sample Videos"
 msgstr ""
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr ""
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr ""
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -7969,11 +7917,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -7989,41 +7937,41 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr ""
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8040,7 +7988,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -10432,10 +10380,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -12945,10 +12889,6 @@ msgstr ""
 msgid "&Define..."
 msgstr ""
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 #, fuzzy
 msgid "Fonts"
diff --git a/po/pa.po b/po/pa.po
index d04de23fd16..62ca91aec94 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -57,8 +57,8 @@ msgstr ""
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -134,7 +134,7 @@ msgstr ""
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -170,7 +170,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2471,7 +2471,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7574,62 +7574,62 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr "ਘੜੀ ਬਾਰੇ(&A)..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr ""
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr ""
 
-#: shell32.rc:329
+#: shell32.rc:316
 #, fuzzy
 msgid "About %s"
 msgstr "ਘੜੀ ਬਾਰੇ(&A)..."
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr ""
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7707,141 +7707,105 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
-
-#: shell32.rc:200
-msgid "My Documents"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
 #: shell32.rc:201
-msgid "Favorites"
+msgid "My Documents"
 msgstr ""
 
 #: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
+msgid "Favorites"
 msgstr ""
 
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr ""
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr ""
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
+#: shell32.rc:215
+msgid "Common Files"
 msgstr ""
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr ""
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7856,52 +7820,36 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+msgid "Sample Music"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:228
+msgid "Sample Videos"
 msgstr ""
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr ""
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr ""
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -7969,11 +7917,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -7989,41 +7937,41 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr ""
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8040,7 +7988,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -10432,10 +10380,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -12945,10 +12889,6 @@ msgstr ""
 msgid "&Define..."
 msgstr ""
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 #, fuzzy
 msgid "Fonts"
diff --git a/po/pl.po b/po/pl.po
index 2b3fe21cf36..5d0f09fea25 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -66,8 +66,8 @@ msgstr "Informacje o wsparciu"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -151,7 +151,7 @@ msgstr "&Zainstaluj"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -191,7 +191,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Nieokreślone"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Nazwa"
 
@@ -2538,7 +2538,7 @@ msgstr "Użycie klucza rozszerzonego (właściwość)"
 msgid "Friendly name"
 msgstr "Przyjazna nazwa"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Opis"
 
@@ -7736,62 +7736,62 @@ msgstr "Za&kończ"
 msgid "&About Control Panel"
 msgstr "Panel sterowania - i&nformacje"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Wybierz folder"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Utwórz nowy folder"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Komunikat"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Tak"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Tak na &wszystkie"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Nie"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "O %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Licencja Wine"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Uruchomiony na %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Możesz korzystać z Wine'a dzięki:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 "Wpisz nazwę programu, katalogu lub dokumentu, a Wine otworzy go dla ciebie."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Otwórz:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Przeglądaj"
@@ -7869,143 +7869,111 @@ msgstr "Wyłącz"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Czy chcesz wyłączyć sesję Wine'a?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Menu Start\\Programy"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programy"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Moje Dokumenty"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Ulubione"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Menu Start\\Programy\\AutoStart"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Historia"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Menu Start"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Moja muzyka"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Moje wideo"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Pulpit"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "NetHood"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Szablony"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Dane aplikacji"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "PrintHood"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Ustawienia lokalne\\Dane aplikacji"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Historia"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Ustawienia lokalne\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Ustawienia Lokalne\\Historia"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Moje obrazy"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Przydomek"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Menu Start\\Programy\\Narzędzia administracyjne"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Muzyka"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Obrazy"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Wideo"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dysków CD"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Program Files (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files (x86)\\Common Files"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Dowiązania"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Obrazy\\Slide Shows"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Muzyka\\Playlists"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Pobrane"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Stan"
@@ -8018,53 +7986,41 @@ msgstr "Położenie"
 msgid "Model"
 msgstr "Model"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Libraries"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Ringtones"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Muzyka\\Przykładowa muzyka"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Obrazy\\Przykładowe obrazy"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Muzyka\\Sample Playlists"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Wideo\\Przykładowe wideo"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Saved Games"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Searches"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Users"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "Linki OEM"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "Dane aplikacji\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Pobrane"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8143,11 +8099,11 @@ msgstr ""
 "przenieść\n"
 "lub skopiować folder?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Nowy Folder"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Panel sterowania Wine"
 
@@ -8163,24 +8119,24 @@ msgstr "Nie można wyświetlić okna dialogowego Przeglądaj (błąd wewnętrzny
 msgid "Executable files (*.exe)"
 msgstr "Pliki wykonywalne (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 "Nie ma przypisanego programu Windowsowego do otwierania tego typu plików."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Czy na pewno chcesz trwale usunąć '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Czy na pewno chcesz trwale usunąć te %1 elementy?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "Potwierdź usunięcie"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8190,7 +8146,7 @@ msgstr ""
 "\n"
 "Czy chcesz go zastąpić?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8200,11 +8156,11 @@ msgstr ""
 "\n"
 "Czy chcesz go zastąpić?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "Potwierdź zastąpienia"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8237,7 +8193,7 @@ msgstr ""
 "wraz z tą biblioteką; jeżeli tak nie jest, napisz do Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Licencja Wine"
 
@@ -11015,10 +10971,6 @@ msgstr "Plik `%s' istnieje. Nie został zastąpiony."
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Grupa zapisana jako `%s aby uniknąć zastąpienia oryginalnego pliku."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programy"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Biblioteki (*.dll)"
@@ -13665,10 +13617,6 @@ msgstr "Z&akładka"
 msgid "&Define..."
 msgstr "&Definiuj..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Historia"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Czcionki"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 485aef6957b..f70c57228d9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -62,8 +62,8 @@ msgstr "Informação de Suporte"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -146,7 +146,7 @@ msgstr "&Instalar"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Não especificado"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Nome"
 
@@ -2526,7 +2526,7 @@ msgstr "Uso de chave avançado (propriedade)"
 msgid "Friendly name"
 msgstr "Nome amigável"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Descrição"
 
@@ -7726,51 +7726,51 @@ msgstr "Sai&r"
 msgid "&About Control Panel"
 msgstr "&Sobre o Painel de Controle"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Procurar pasta"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Pasta:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Criar nova pasta"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Mensagem"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Sim"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Sim para &todos"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Não"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Sobre %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Licença do Wine"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Executando em %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine foi disponibilizado por:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7778,11 +7778,11 @@ msgstr ""
 "Digite o nome do programa, pasta, documento ou endereço de Internet que o "
 "Wine irá abri-lo."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Abrir:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Procurar..."
@@ -7860,143 +7860,111 @@ msgstr "Desligar"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Deseja finalizar a sessão do Wine?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Menu Iniciar\\Programas"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programas"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Meus Documentos"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Menu Iniciar\\Programas\\Iniciar"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recentes"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Enviar Para"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Menu Iniciar"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Minhas Músicas"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Meus Vídeos"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Área de Trabalho"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Rede"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Modelo"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Dados de aplicativos"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Impressoras"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Configurações locais\\Dados de aplicativos"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Histórico"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Configurações locais\\Arquivos temporários da Internet"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Configurações locais\\Histórico"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Arquivos de programas"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Minhas Imagens"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Arquivos de programas\\Arquivos comuns"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Nome Comum"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documentos"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Menu Iniciar\\Programas\\Ferramentas Administrativas"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Documentos\\Minhas Músicas"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Documentos\\Minhas Imagens"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Documentos\\Meus Vídeos"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Configurações locais\\Dados de aplicativos\\Microsoft\\Queima de CDs"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Arquivos de programas (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Arquivos de programas (x86)\\Arquivos comuns"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Contatos"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Atalhos"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Imagens\\Apresentações"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Músicas\\Listas de reprodução"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Downloads"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Estado"
@@ -8009,53 +7977,41 @@ msgstr "Localização"
 msgid "Model"
 msgstr "Modelo"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Bibliotecas"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Toques de celular"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Músicas\\Amostra de músicas"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Imagens\\Amostra de imagens"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Músicas\\Amostra de listas de reprodução"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Videos\\Amostra de vídeos"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Jogos salvos"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Buscas"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Usuários"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "Atalhos OEM"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Downloads"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8131,11 +8087,11 @@ msgstr ""
 "na pasta selecionada, eles serão sobrescritos. Deseja mover ou copiar a\n"
 "pasta mesmo assim?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Nova Pasta"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Painel de Controle do Wine"
 
@@ -8152,24 +8108,24 @@ msgstr "Não é possível mostrar a caixa de diálogo de Procura (erro interno)"
 msgid "Executable files (*.exe)"
 msgstr "Arquivos executáveis (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 "Não existe um programa Windows configurado para abrir este tipo de arquivo."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Você tem certeza que deseja excluir '%1' permanentemente?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Você tem certeza que deseja excluir estes %1 itens permanentemente?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "Confirmar exclusão"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8179,7 +8135,7 @@ msgstr ""
 "\n"
 "Gostaria de substituí-lo?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8189,11 +8145,11 @@ msgstr ""
 "\n"
 "Gostaria de substituí-la?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "Confirmar sobrescrever"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8224,7 +8180,7 @@ msgstr ""
 "Wine; senão, escreva à Free Software Foundation, Inc., 51 Franklin St, Fifth "
 "Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Licença do Wine"
 
@@ -11019,10 +10975,6 @@ msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 "Salvar grupo como '%s' para prevenir a sobrescrita dos arquivos originais."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programas"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Bibliotecas (*.dll)"
@@ -13662,10 +13614,6 @@ msgstr "&Marcador de Página"
 msgid "&Define..."
 msgstr "&Definir..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Histórico"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Fontes"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 06669d0c780..128dd29d70e 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -62,8 +62,8 @@ msgstr "Informação de Suporte"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -146,7 +146,7 @@ msgstr "&Instalar"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Não especificado"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Nome"
 
@@ -2624,7 +2624,7 @@ msgstr "Uso de chave avançado (propriedade)"
 msgid "Friendly name"
 msgstr "Nome amigável"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Descrição"
 
@@ -7980,51 +7980,51 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr "&Sobre o painel de controlo..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Procurar pasta"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Pasta:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Criar nova pasta"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Mensagem"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Sim"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Sim a &todos"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Não"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Acerca do %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Licença do Wine"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Executando em %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine disponibilizado por:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -8032,11 +8032,11 @@ msgstr ""
 "Digite o nome do programa, pasta, documento, ou endereço Internet, que o "
 "Wine irá abrí-lo."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Abrir:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Procurar"
@@ -8124,43 +8124,35 @@ msgstr "Desligar"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Deseja finalizar esta sessão do Wine?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Menu Iniciar\\Programas"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programas"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Os Meus Documentos"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favoritos"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Menu Iniciar\\Programas\\Iniciar"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recentes"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Enviar Para"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Menu Iniciar"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "As Minhas Músicas"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Os Meus Vídeos"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
@@ -8170,102 +8162,78 @@ msgstr ""
 "#-#-#-#-#  pt_PT.po (Wine)  #-#-#-#-#\n"
 "Ambiente de trabalho"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Rede"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Modelos"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Dados de aplicação"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Impressoras"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Definições locais\\Dados de aplicação"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Histórico"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Definições locais\\Ficheiros temporários de Internet"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Definições locais\\Histórico"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Programas"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "As Minhas Imagens"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Programas\\Ficheiros comuns"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Nome Comum"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Os Meus Documentos"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Menu Iniciar\\Programas\\Ferramentas Administrativas"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Os Meus Documentos\\As Minhas Músicas"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Os Meus Documentos\\As Minhas Imagens"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Os Meus Documentos\\Os Meus Vídeos"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Definições locais\\Dados de aplicação\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Programas (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Programas (x86)\\Ficheiros comuns"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Contatos"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Ligações"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Imagens\\Apresentações"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Músicas\\Listas de reprodução"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Downloads"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Estado"
@@ -8278,53 +8246,41 @@ msgstr "Localização"
 msgid "Model"
 msgstr "Modelo"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Bibliotecas"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Ringtones"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Músicas\\Amostra de músicas"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Imagens\\Amostra de imagens"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Músicas\\Amostra de listas de reprodução"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Videos\\Amostra de vídeos"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Jogos salvos"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Buscas"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Utilizadores"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Links"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Downloads"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8399,11 +8355,11 @@ msgstr ""
 "pasta seleccionada eles serão substituídos. Ainda deseja mover ou copiar a "
 "pasta?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Nova Pasta"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Painel de controlo do Wine"
 
@@ -8420,27 +8376,27 @@ msgstr "Não é possível mostrar a caixa de diálogo de Procura (erro interno)"
 msgid "Executable files (*.exe)"
 msgstr "Ficheiros executáveis (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 "Não existe um programa Windows configurado para abrir este tipo de ficheiro."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Tem certeza que deseja excluir '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Tem certeza que deseja excluir estes %1 itens?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Confirmar exclusão do ficheiro"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8450,7 +8406,7 @@ msgstr ""
 "O ficheiro já existe.\n"
 "Gostaria de o substituir?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8460,12 +8416,12 @@ msgstr ""
 "O ficheiro já existe.\n"
 "Gostaria de o substituir?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Confirmar substituição de ficheiro"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8496,7 +8452,7 @@ msgstr ""
 "Wine; se não, escreva à Free Software Foundation, Inc., 51 Franklin St, "
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Licença do Wine"
 
@@ -11334,10 +11290,6 @@ msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 "Gravar grupo como '%s' para prevenir a sobreescrita dos ficheiros originais."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programas"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Bibliotecas (*.dll)"
@@ -14039,10 +13991,6 @@ msgstr "In&dicador"
 msgid "&Define..."
 msgstr "&Definir..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Histórico"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Tipos de Letra"
diff --git a/po/rm.po b/po/rm.po
index 0c6e62066d8..644eb1d84e6 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -61,8 +61,8 @@ msgstr "INFUORMAZIUN"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -139,7 +139,7 @@ msgstr "&Annotaziun..."
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -175,7 +175,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2495,7 +2495,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7625,64 +7625,64 @@ msgstr "&Finir"
 msgid "&About Control Panel"
 msgstr "I&nfuormaziuns"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr ""
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr ""
 
-#: shell32.rc:329
+#: shell32.rc:316
 #, fuzzy
 msgid "About %s"
 msgstr "I&nfuormaziuns"
 
-#: shell32.rc:333
+#: shell32.rc:320
 #, fuzzy
 msgid "Wine &license"
 msgstr "Wine ag�d"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 #, fuzzy
 msgid "&Open:"
 msgstr "&Rivir"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7760,142 +7760,106 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
-
-#: shell32.rc:200
-msgid "My Documents"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
 #: shell32.rc:201
-msgid "Favorites"
+msgid "My Documents"
 msgstr ""
 
 #: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
+msgid "Favorites"
 msgstr ""
 
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr ""
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 #, fuzzy
 msgid "PrintHood"
 msgstr "&Stampar tema"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
+#: shell32.rc:215
+msgid "Common Files"
 msgstr ""
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr ""
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7910,53 +7874,36 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+msgid "Sample Music"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:228
+msgid "Sample Videos"
 msgstr ""
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr ""
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr ""
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-#, fuzzy
-msgid "OEM Links"
-msgstr "&Rivir"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -8024,11 +7971,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -8045,41 +7992,41 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "Tuot las datotecas (*.*)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8096,7 +8043,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 #, fuzzy
 msgid "Wine License"
 msgstr "Wine ag�d"
@@ -10503,10 +10450,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13037,10 +12980,6 @@ msgstr "&Marca"
 msgid "&Define..."
 msgstr "&Definir..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 51c4eaea899..0f1bf2c553f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -62,8 +62,8 @@ msgstr "Informații de asistență"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -147,7 +147,7 @@ msgstr "&Instalează"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Ne specificat"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Nume"
 
@@ -2666,7 +2666,7 @@ msgstr "Utilizări adiționale ale cheii (proprietate)"
 msgid "Friendly name"
 msgstr "Nume uzual"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Descriere"
 
@@ -8207,51 +8207,51 @@ msgstr "Înc&hide"
 msgid "&About Control Panel"
 msgstr ""
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Selectare dosar"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Dosar:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Creează un dosar nou"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Mesaj"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Da"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Da la &toate"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Nu"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Despre %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Licența Wine"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Rulând pe %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine a fost vinificat de:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -8259,11 +8259,11 @@ msgstr ""
 "Introduceți numele unui program, dosar, document sau resursă internet și "
 "Wine îl va deschide."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Deschide:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "Navi&gare"
@@ -8356,43 +8356,35 @@ msgstr "Oprire"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Vreți să opriți sesiunea de Wine?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Meniu Start\\Programe"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programe"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Documentele mele"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favorite"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Meniu Start\\Programe\\AutoStart"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recente"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Meniu Start"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Muzica mea"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Filmele mele"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
@@ -8402,105 +8394,78 @@ msgstr ""
 "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
 "Birou"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "NetHood"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Templates"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "PrintHood"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Istorie"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "My Pictures"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Nume uzual"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documente"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Meniu Start\\Programe\\Scule administrative"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Documente\\Muzica mea"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Documente\\Pozele mele"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Documente\\Filmele mele"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 #, fuzzy
 msgid "Program Files (x86)"
 msgstr "Program Files"
 
 #: shell32.rc:221
 #, fuzzy
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files\\Common Files"
-
-#: shell32.rc:228
-#, fuzzy
 msgid "Contacts"
 msgstr "&Conținut"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Legături"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
+#: shell32.rc:224
 #, fuzzy
-msgid "Downloads"
-msgstr "Descarc..."
+msgid "Playlists"
+msgstr "listă"
 
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
@@ -8514,40 +8479,31 @@ msgstr "Locație"
 msgid "Model"
 msgstr "Model"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Eșantion"
+
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
+msgstr "&Salvează imaginea ca..."
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "&Salvează videoul ca..."
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "S&alvare ca..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr ""
@@ -8556,19 +8512,15 @@ msgstr ""
 "#-#-#-#-#  ro.po (Wine)  #-#-#-#-#\n"
 "&Caută"
 
-#: shell32.rc:242
+#: shell32.rc:231
 #, fuzzy
 msgid "Users"
 msgstr "Nume utilizator"
 
-#: shell32.rc:243
+#: shell32.rc:233
 #, fuzzy
-msgid "OEM Links"
-msgstr "Legături"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr ""
+msgid "Downloads"
+msgstr "Descarc..."
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8644,11 +8596,11 @@ msgstr ""
 "dosarul\n"
 "selectat vor fi înlocuite. Mai vreți să mutați sau să copiați dosarul?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Dosar nou"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Panoul de control al Wine"
 
@@ -8664,27 +8616,27 @@ msgstr "Nu se poate afișa caseta de navigare (eroare internă)"
 msgid "Executable files (*.exe)"
 msgstr "Fișiere executabile (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 "Nici un program Windows nu este configurat să deschidă fișiere de acest tip."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Sunteți sigur că vreți să ștergeți '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Sunteți sigur că vreți să ștergeți acest %1 elemente?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Confirmați ștergerea fișierului"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8694,7 +8646,7 @@ msgstr ""
 "Fișierul există deja.\n"
 "Doriți să îl înlocuiți?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8704,12 +8656,12 @@ msgstr ""
 "Fișierul există deja.\n"
 "Doriți să îl înlocuiți?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Confirmați suprascrierea fișierului"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8743,7 +8695,7 @@ msgstr ""
 "\n"
 "Consultați fișierul COPYING.LIB pentru informații despre licență.\n"
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Licența Wine"
 
@@ -11577,10 +11529,6 @@ msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 "Salvează grupul ca „%s” pentru a preveni suprascrierea fișierelor originale."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programe"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Biblioteci (*.dll)"
@@ -14277,10 +14225,6 @@ msgstr "&Se&mn de carte"
 msgid "&Define..."
 msgstr "&Definește..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Istorie"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 #, fuzzy
 msgid "Fonts"
diff --git a/po/ru.po b/po/ru.po
index 241a7be11dd..2c518b5adbe 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -61,8 +61,8 @@ msgstr "Сведения о поддержке"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -146,7 +146,7 @@ msgstr "&Установить"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Отсутствует"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Имя"
 
@@ -2523,7 +2523,7 @@ msgstr "Расширенное использование ключа (свойс
 msgid "Friendly name"
 msgstr "Понятное имя"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Описание"
 
@@ -7715,51 +7715,51 @@ msgstr "В&ыйти"
 msgid "&About Control Panel"
 msgstr "&О Панели Управления"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Обзор"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Папка:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "Создать &новую папку"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Сообщение"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Да"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Да для &всех"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Нет"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "О %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Лицензия Wine"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Версия Wine %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Разработчики Wine:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7767,11 +7767,11 @@ msgstr ""
 "Введите имя программы, папки, документа или ресурс Интернета, и Wine откроет "
 "их."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Открыть:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Обзор..."
@@ -7849,143 +7849,111 @@ msgstr "Выключить питание"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Закончить работу с Wine?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Главное меню\\Программы"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Программы"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Мои документы"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Избранное"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Главное меню\\Программы\\Автозагрузка"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Недавнее"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Отправить"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Главное меню"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Моя музыка"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Мои фильмы"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Рабочий стол"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Сетевое окружение"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Принтеры"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "История"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Мои рисунки"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Общее имя"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Общие документы"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Главное меню\\Программы\\Администрирование"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Общие документы\\Моя музыка"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Общие документы\\Мои рисунки"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Общие документы\\Мои фильмы"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Program Files (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files (x86)\\Common Files"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Контакты"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Ссылки"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Рисунки\\Слайд-шоу"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Музыка\\Списки воспроизведения"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Загрузки"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Состояние"
@@ -7998,53 +7966,41 @@ msgstr "Размещение"
 msgid "Model"
 msgstr "Модель"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\Обозреватель игр"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Библиотеки"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Мелодии звонка"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Музыка\\Образцы музыки"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Изображения\\Образцы изображений"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Музыка\\Образцы списков воспроизведения"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Видео\\Образцы видео"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Сохранённые игры"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Поиски"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Пользователи"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM-Ссылки"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Загрузки"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8119,11 +8075,11 @@ msgstr ""
 "папке, они будут заменены. Вы всё ещё хотите переместить или скопировать\n"
 "папку?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Новая папка"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Панель Управления Wine"
 
@@ -8139,23 +8095,23 @@ msgstr "Невозможно отобразить диалог Обзор (вн
 msgid "Executable files (*.exe)"
 msgstr "Исполняемые файлы (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "Программы для открытия файлов этого типа не сконфигурировано."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Вы действительно хотите удалить '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Вы действительно хотите навсегда удалить эти объекты (%1)?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "Подтверждение удаления"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8165,7 +8121,7 @@ msgstr ""
 "\n"
 "Вы хотите заменить его?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8175,11 +8131,11 @@ msgstr ""
 "\n"
 "Вы хотите заменить её?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "Подтверждение замены"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8209,7 +8165,7 @@ msgstr ""
 "так, обратитесь в Free Software Foundation, Inc., 51 Franklin St, Fifth "
 "Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Лицензия Wine"
 
@@ -10975,10 +10931,6 @@ msgstr "Файл `%s' существует. Он не был перезапис
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Группа сохраняется под именем `%s' во избежание перезаписи оригинала."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Программы"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Библиотеки (*.dll)"
@@ -13593,10 +13545,6 @@ msgstr "&Закладка"
 msgid "&Define..."
 msgstr "&Определить..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "История"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Шрифты"
diff --git a/po/sk.po b/po/sk.po
index cd7470db382..9ed4453036c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -61,8 +61,8 @@ msgstr "Informácie"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -141,7 +141,7 @@ msgstr "&Skomentovať..."
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -178,7 +178,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Nebol špecifikovaný žiadny príkaz."
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2492,7 +2492,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7719,62 +7719,62 @@ msgstr "U&končiť"
 msgid "&About Control Panel"
 msgstr ""
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 #, fuzzy
 msgid "&Make New Folder"
 msgstr "Vytvoriť nový adresár"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "Án&o"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Nie"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "O programe %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Víno pre vás pripravili:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr ""
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7853,143 +7853,108 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Moje dokumenty"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr ""
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr ""
-
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Pracovná plocha"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 #, fuzzy
 msgid "PrintHood"
 msgstr "&Tlačiť"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr ""
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Kopírovanie súborov..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr ""
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -8005,52 +7970,38 @@ msgstr "Informácie"
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Vzorka"
+
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "Vzorka"
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr ""
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr ""
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -8118,11 +8069,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -8139,41 +8090,41 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "Súbory pomoci (*.hlp)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8190,7 +8141,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 #, fuzzy
 msgid "Wine License"
 msgstr "Wine Pomoc"
@@ -10641,10 +10592,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13213,10 +13160,6 @@ msgstr "&Záložka"
 msgid "&Define..."
 msgstr "&Definovať..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Písma"
diff --git a/po/sl.po b/po/sl.po
index 40e96860d91..75124e016fd 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -62,8 +62,8 @@ msgstr "Podporni podatki"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -146,7 +146,7 @@ msgstr "&Namesti"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -186,7 +186,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Ni navedeno"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Ime"
 
@@ -2523,7 +2523,7 @@ msgstr "Uporaba izboljšanega ključa (lastnost)"
 msgid "Friendly name"
 msgstr "Prijazno ime"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Opis"
 
@@ -7711,51 +7711,51 @@ msgstr "&Končaj"
 msgid "&About Control Panel"
 msgstr "&O nadzorni plošči"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Brskanje po mapah"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Mapa:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "Ustvari &novo mapo"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Sporočilo"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Da"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Da za &vse"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Ne"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "O %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Licenčna pog."
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Izvajanje na %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine smo ustvarili:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7763,11 +7763,11 @@ msgstr ""
 "Vnesite ime programa, mape, dokumenta ali spletne strani, in Wine ga (jo) bo "
 "odprl."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Odpri:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Brskaj ..."
@@ -7845,143 +7845,111 @@ msgstr "Izklop"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Ali želite končati svojo sejo Wine?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Meni Start\\Programi"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programi"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Moji dokumenti"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Priljubljene"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Meni Start\\Programi\\Zagon"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Nedavno"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "PošljiNa"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Meni Start"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Moja glasba"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Moji videi"
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Namizje"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Omrežje"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Predloge"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Podatki programov"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Tiskalniki"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Krajevne nastavitve\\Podatki programov"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Zgodovina"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Krajevne nastavitve\\Začasne internetne datoteke"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Piškotki"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Krajevne nastavitve\\Zgodovina"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Programi"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Moje slike"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Programi\\Skupne datoteke"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Splošno ime"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Dokumenti"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Meni start\\Programi\\Skrbniška orodja"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Glasba"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Slike"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Videi"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Krajevne nastavitve\\Podatki programov\\Microsoft\\Zapisovanje CD-jev"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Programi (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Programi (x86)\\Skupne datoteke"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Stiki"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Povezave"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Slike\\Predstavitve"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Glasba\\Seznami predvajanja"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Prejemi"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Stanje"
@@ -7994,53 +7962,41 @@ msgstr "Mesto"
 msgid "Model"
 msgstr "Model"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\Raziskovalnik Iger"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Knjižnice"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Zvonenja"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Glasba\\Primeri glasbe"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Slike\\Primeri slik"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Glasba\\Primeri seznamov predvajanja"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Videi\\Primeri video posnetkov"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Shranjene igre"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Iskanja"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Uporabniki"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "Povezave OEM"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "ProgramskiPodatki\\Krajevno nizko"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Prejemi"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8115,11 +8071,11 @@ msgstr ""
 "Datoteke v ciljni mapi, ki imajo enaka imena kot datoteke v izvorni mapi,\n"
 "bodo prepisane. Ali še vedno želite premakniti oziroma kopirati mapo?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Nova mapa"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Nadzorna plošča Wine"
 
@@ -8135,23 +8091,23 @@ msgstr "Pogovornega okna Brskanje ni mogoče prikazati (notranja napaka)"
 msgid "Executable files (*.exe)"
 msgstr "Izvedljive datoteke (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "Za odpiranje te vrste datotek ni na voljo noben program Windows."
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Ali ste prepričani, da želite trajno izbrisati '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Ali ste prepričani, da želite izbrisati te predmete (%1)?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr "Potrditev izbrisa"
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
@@ -8161,7 +8117,7 @@ msgstr ""
 "\n"
 "Ali jo želite zamenjati?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
@@ -8171,11 +8127,11 @@ msgstr ""
 "\n"
 "Ali jo želite zamenjati?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr "Potrdi prepis"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8207,7 +8163,7 @@ msgstr ""
 "na naslov Free Software Foundation, Inc.,59 Temple Place - Suite 330, "
 "Boston, MA 02111-1307, USA in zahtevajte kopijo."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Licenca Wine"
 
@@ -10972,10 +10928,6 @@ msgstr "Datoteka `%s' že obstaja in ni bila prepisana."
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Shranite skupino kot `%s' in s tem preprečite prepis izvirnih datotek."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programi"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Knjižnice (*.dll)"
@@ -13606,10 +13558,6 @@ msgstr "&Ustvari zaznamek"
 msgid "&Define..."
 msgstr "Do&loči ..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Zgodovina"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Pisave"
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index eb545c26488..1b65f214e18 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -61,8 +61,8 @@ msgstr "Подршка"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -144,7 +144,7 @@ msgstr "&Инсталирај"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -182,7 +182,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Није одређено"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 #, fuzzy
 msgid "Name"
 msgstr ""
@@ -2535,7 +2535,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Опис"
 
@@ -7982,51 +7982,51 @@ msgstr "&Излаз"
 msgid "&About Control Panel"
 msgstr "&О управљачком панелу..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Претраживање фасцикли"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Фасцикла:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Направи нову фасциклу"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Порука"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Да"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Да за &све"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Не"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "О програму %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Wine &лиценца"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Ради на %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine су Вам омогућили:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -8034,11 +8034,11 @@ msgstr ""
 "Унесите назив програма, фасцикле, документа или интернет ресурса, а Wine ће "
 "га отворити."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Отвори:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Разгледај..."
@@ -8117,144 +8117,112 @@ msgstr "Гашење"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Желите ли да изгасите Wine сесију?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "„Старт“ мени\\Програми"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr ""
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Документи"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Омиљено"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "„Старт“ мени\\Програми\\Покретање"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Скорашње"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Пошаљи у"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "„Старт“ мени"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Музика"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Видео снимци"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Радна површина"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Интернет"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Шаблони"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Програмски подаци"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Штампачи"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Локалне поставке\\Програмски подаци"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Локалне поставке\\Привремене интернет датотеке"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Колачићи"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Локалне поставке\\Историјат"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Програми"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Слике"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Програми\\Заједничке датотеке"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Умножавање датотека..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Документи"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "„Старт“ мени\\Програми\\Административне алатке"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Музика"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Слике"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Видео снимци"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Локалне поставке\\Програмски подаци\\Microsoft\\ЦД резање"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Програми (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Програми (x86)\\Заједничке датотеке"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Контакти"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Везе"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Слике\\Покретни прикази"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Музика\\Спискови нумера"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Пријеми"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Стање"
@@ -8267,53 +8235,41 @@ msgstr "Локација"
 msgid "Model"
 msgstr "Модел"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Библиотеке"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Мелодије"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Музика\\Примерци"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Слике\\Примерци"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Музика\\Примерци"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Видео снимци\\Примерци"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Сачуване игре"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Претраге"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Корисници"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM везе"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Пријеми"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8390,11 +8346,11 @@ msgstr ""
 "умножите\n"
 "фасциклу?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Нова фасцикла"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine управљачки панел"
 
@@ -8411,26 +8367,26 @@ msgstr "Приказивање прозорчета за разгледање н
 msgid "Executable files (*.exe)"
 msgstr "Извршне датотеке (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "Ниједан програм није подешен да отвара ову врсту датотека."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Желите ли да избришете „%1“?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Желите ли да избришете ових %1 ставки?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Потврда брисања датотеке"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8440,7 +8396,7 @@ msgstr ""
 "Датотека већ постоји.\n"
 "Желите ли да је замените?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8450,12 +8406,12 @@ msgstr ""
 "Датотека већ постоји.\n"
 "Желите ли да је замените?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Потврда замене датотеке"
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8472,7 +8428,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine лиценца"
 
@@ -10950,10 +10906,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13634,10 +13586,6 @@ msgstr ""
 msgid "&Define..."
 msgstr ""
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Фонтови"
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index f5c02b89e17..b3950aa5a4f 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -61,8 +61,8 @@ msgstr "Podrška"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -144,7 +144,7 @@ msgstr "&Instaliraj"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -182,7 +182,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Nije određeno"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 #, fuzzy
 msgid "Name"
 msgstr ""
@@ -2609,7 +2609,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Opis"
 
@@ -8081,51 +8081,51 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr "&O upravljačkom panelu..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Pretraživanje fascikli"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Fascikla:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Napravi novu fasciklu"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Poruka"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Da"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Da za &sve"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Ne"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "O programu %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Wine &licenca"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Radi na %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine su Vam omogućili:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -8133,11 +8133,11 @@ msgstr ""
 "Unesite naziv programa, fascikle, dokumenta ili internet resursa, a Wine će "
 "ga otvoriti."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Otvori:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Nađi..."
@@ -8216,144 +8216,112 @@ msgstr "Gašenje"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Želite li da izgasite Wine sesiju?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "„Start“ meni\\Programi"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr ""
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Dokumenti"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Omiljeno"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "„Start“ meni\\Programi\\Pokretanje"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Skorašnje"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Pošalji u"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "„Start“ meni"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Muzika"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Video snimci"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Radna površina"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Internet"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Šabloni"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Programski podaci"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Štampači"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Lokalne postavke\\Programski podaci"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Istorija"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Lokalne postavke\\Privremene internet datoteke"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Kolačići"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Lokalne postavke\\Istorijat"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Programi"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Slike"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Programi\\Zajedničke datoteke"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Umnožavanje datoteka..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Dokumenti"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "„Start“ meni\\Programi\\Administrativne alatke"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Muzika"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Slike"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Video snimci"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Lokalne postavke\\Programski podaci\\Microsoft\\CD rezanje"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Programi (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Programi (x86)\\Zajedničke datoteke"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Veze"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Slike\\Pokretni prikazi"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Muzika\\Spiskovi numera"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Prijemi"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Stanje"
@@ -8366,53 +8334,41 @@ msgstr "Lokacija"
 msgid "Model"
 msgstr "Model"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Biblioteke"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Melodije"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Muzika\\Primerci"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Slike\\Primerci"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Muzika\\Primerci"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Video snimci\\Primerci"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Sačuvane igre"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Pretrage"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Korisnici"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM veze"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Prijemi"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8489,11 +8445,11 @@ msgstr ""
 "umnožite\n"
 "fasciklu?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Nova fascikla"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine upravljački panel"
 
@@ -8511,26 +8467,26 @@ msgstr "Prikazivanje prozorčeta za razgledanje nije uspelo (unutrašnja greška
 msgid "Executable files (*.exe)"
 msgstr "Izvršne datoteke (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "Nijedan program nije podešen da otvara ovu vrstu datoteka."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Želite li da izbrišete „%1“?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Želite li da izbrišete ovih %1 stavki?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Potvrda brisanja datoteke"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8540,7 +8496,7 @@ msgstr ""
 "Datoteka već postoji.\n"
 "Želite li da je zamenite?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8550,12 +8506,12 @@ msgstr ""
 "Datoteka već postoji.\n"
 "Želite li da je zamenite?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Potvrda zamene datoteke"
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8572,7 +8528,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine licenca"
 
@@ -11084,10 +11040,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13781,10 +13733,6 @@ msgstr "&Označi"
 msgid "&Define..."
 msgstr "&Odredi..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Istorija"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Fontovi"
diff --git a/po/sv.po b/po/sv.po
index 4e634f2179a..176fe4f852a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -62,8 +62,8 @@ msgstr "Supportinformation"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -145,7 +145,7 @@ msgstr "&Installera"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Inte angivet"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Namn"
 
@@ -2526,7 +2526,7 @@ msgstr "Utökad nyckelanvändning (egenskap)"
 msgid "Friendly name"
 msgstr "Vänligt namn"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -7720,51 +7720,51 @@ msgstr "A&vsluta"
 msgid "&About Control Panel"
 msgstr "&Om Kontrollpanelen..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Bläddra efter mapp"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Mapp:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "Ny &mapp"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Meddelande"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Ja"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Ja till &allt"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Nej"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Om %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "Wine-&licens"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Kör på %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine hade inte varit möjligt utan dessa personer:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7772,11 +7772,11 @@ msgstr ""
 "Skriv namnet på ett program, en mapp eller ett dokument och Wine kommer att "
 "öppna det åt dig."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Öppna:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Bläddra"
@@ -7855,144 +7855,112 @@ msgstr "Avsluta"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Vill du avsluta Wine?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Start-meny\\Program"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Program"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Mina dokument"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favoriter"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Start-meny\\Program\\Uppstart"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Senaste"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Start-meny"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Min musik"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Mina videoklipp"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Skrivbord"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Nätverket"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Mallar"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Programdata"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Skrivare"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Lokala inställningar\\Programdata"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Historik"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Lokala inställningar\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Lokala inställningar\\Tidigare"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Mina bilder"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program\\Gemensamma filer"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Kopierar filer..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Dokument"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start-meny\\Program\\Administrationsverktyg"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Musik"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Bilder"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Videoklipp"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Lokala inställningar\\Programdata\\Microsoft\\CD-bränning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Program (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program (x86)\\Gemensamma filer"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Länkar"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Bilder\\Slide Shows"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Musik\\Playlists"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Nedladdningar"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Status"
@@ -8005,53 +7973,41 @@ msgstr "Plats"
 msgid "Model"
 msgstr "Modell"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Libraries"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Ringsignaler"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Musik\\Sample Music"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Bilder\\Sample Pictures"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Musik\\Sample Playlists"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Videoklipp\\Sample Videos"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Sparade spel"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Sökningar"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Användare"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Links"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Nedladdningar"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8128,11 +8084,11 @@ msgstr ""
 "mappen så kommer de bli ersatta. Vill du ändå flytta eller kopiera\n"
 "mappen?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Ny mapp"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wines kontrollpanel"
 
@@ -8148,26 +8104,26 @@ msgstr "Kunde inte visa Bläddra-fönstret (internt fel)"
 msgid "Executable files (*.exe)"
 msgstr "Programfiler (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "Inget Windows-program är inställt för att öppna denna filtyp."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Är du säker du vill ta bort «%1»?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Är du säker du vill ta bort dessa %1 element?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Bekräfta filborttagning"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8177,7 +8133,7 @@ msgstr ""
 "Filen finns redan.\n"
 "Vill du ersätta den?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8187,12 +8143,12 @@ msgstr ""
 "Filen finns redan.\n"
 "Vill du ersätta den?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Bekräfta överskrivning av fil"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8223,7 +8179,7 @@ msgstr ""
 "med Wine; om inte, skriv till: the Free Software Foundation, Inc., 51 "
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine-licens"
 
@@ -10977,10 +10933,6 @@ msgstr "Filen '%s' fanns redan, och skrevs ej över."
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Spara grupp som '%s' för att undvika att skriva över filer."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Program"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Bibliotek (*.dll)"
@@ -13650,10 +13602,6 @@ msgstr "&Bokmärke"
 msgid "&Define..."
 msgstr "&Definiera..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Historik"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Typsnitt"
diff --git a/po/te.po b/po/te.po
index 4bbee094220..e4317aa1713 100644
--- a/po/te.po
+++ b/po/te.po
@@ -57,8 +57,8 @@ msgstr ""
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -134,7 +134,7 @@ msgstr ""
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -170,7 +170,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2471,7 +2471,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7574,62 +7574,62 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr "గడియారం గురించి... (&A)"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr ""
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr ""
 
-#: shell32.rc:329
+#: shell32.rc:316
 #, fuzzy
 msgid "About %s"
 msgstr "గడియారం గురించి... (&A)"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr ""
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7707,141 +7707,105 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
-
-#: shell32.rc:200
-msgid "My Documents"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
 #: shell32.rc:201
-msgid "Favorites"
+msgid "My Documents"
 msgstr ""
 
 #: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
+msgid "Favorites"
 msgstr ""
 
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr ""
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr ""
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
+#: shell32.rc:215
+msgid "Common Files"
 msgstr ""
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr ""
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7856,52 +7820,36 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+msgid "Sample Music"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:228
+msgid "Sample Videos"
 msgstr ""
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr ""
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr ""
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -7969,11 +7917,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -7989,41 +7937,41 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr ""
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8040,7 +7988,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -10432,10 +10380,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -12945,10 +12889,6 @@ msgstr ""
 msgid "&Define..."
 msgstr ""
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 #, fuzzy
 msgid "Fonts"
diff --git a/po/th.po b/po/th.po
index 2ccd7e7108c..260dd91a60e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -58,8 +58,8 @@ msgstr "รายละเอียด"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -138,7 +138,7 @@ msgstr ""
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -174,7 +174,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2497,7 +2497,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7704,65 +7704,65 @@ msgstr "ออก"
 msgid "&About Control Panel"
 msgstr ""
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 #, fuzzy
 msgid "&Make New Folder"
 msgstr "สร้างไดเรกทอรีใหม่"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 #, fuzzy
 msgid "&No"
 msgstr "ไม่ใช่"
 
-#: shell32.rc:329
+#: shell32.rc:316
 #, fuzzy
 msgid "About %s"
 msgstr "เกี่ยวกับนาฬิกา..."
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 #, fuzzy
 msgid "&Open:"
 msgstr "เปิด...\tCtrl+O"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7844,143 +7844,108 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "พื้นที่ส่วนตัว"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr ""
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr ""
-
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "พื้นที่ทำงาน"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr ""
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr ""
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "เนื้อหา"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 #, fuzzy
 msgid "Contacts"
 msgstr "เนื้อหา"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7996,54 +7961,40 @@ msgstr "รายละเอียด"
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "ตัวอย่าง"
+
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "ตัวอย่าง"
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "บันทืกเป็น..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "คันหา"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -8111,11 +8062,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -8132,43 +8083,43 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "แฟ้มตํารา (*.txt)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "กําลังจะลบ; "
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "กําลังจะลบ; "
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8185,7 +8136,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -10616,10 +10567,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13176,10 +13123,6 @@ msgstr ""
 msgid "&Define..."
 msgstr ""
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "ดัวอักษร"
diff --git a/po/tr.po b/po/tr.po
index f4875399728..272e90167a1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -61,8 +61,8 @@ msgstr "Bilgi"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -148,7 +148,7 @@ msgstr "&Kur"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -188,7 +188,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Komut belirtilmemiş."
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Ad"
 
@@ -2530,7 +2530,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7996,54 +7996,54 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr ""
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Dizine Gözat"
 
-#: shell32.rc:303
+#: shell32.rc:290
 #, fuzzy
 msgid "Folder:"
 msgstr "Klasör"
 
-#: shell32.rc:309
+#: shell32.rc:296
 #, fuzzy
 msgid "&Make New Folder"
 msgstr "Yeni Dizin Oluştur"
 
-#: shell32.rc:316
+#: shell32.rc:303
 #, fuzzy
 msgid "Message"
 msgstr "BLK Kullanımı"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Evet"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Hayır"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "%s Hakkında"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine'ı size sunan geliştiriciler:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -8051,11 +8051,11 @@ msgstr ""
 "Herhangi bir program, dizin, belge veya Internet kaynağı seçin ve Wine sizin "
 "için açsın."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Aç:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Gözat"
@@ -8134,147 +8134,112 @@ msgstr "Oturumu Kapat"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Wine oturumunuzu kapatmak istediğinizden emin misiniz?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Start Menu\\Programlar"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Programlar"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Belgelerim"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Sık Kullanılanlar"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Start Menu\\Programlar\\Başlangıç"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recent"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Start Menu"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Belgelerim\\Müziğim"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Belgelerim\\Vidyolarım"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Masaüstü"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "NetHood"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Templates"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "PrintHood"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Belgelerim\\Resimlerim"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Dosyalar Kopyalanıyor..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Belgeler"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start Menu\\Programlar\\Yönetimsel Araçlar"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Belgeler\\Müziğim"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Belgeler\\Resimlerim"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Belgeler\\Videolarım"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 #, fuzzy
 msgid "Program Files (x86)"
 msgstr "Program Files"
 
 #: shell32.rc:221
 #, fuzzy
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files\\Common Files"
-
-#: shell32.rc:228
-#, fuzzy
 msgid "Contacts"
 msgstr "&İçindekiler"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Bağlantılar"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
+#: shell32.rc:224
 #, fuzzy
-msgid "Downloads"
-msgstr "İndiriliyor..."
+msgid "Playlists"
+msgstr "Yürüt"
 
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
@@ -8289,40 +8254,31 @@ msgstr "LAN Bağlantısı"
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Örnek"
+
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
+msgstr "&Resmi Farklı Kaydet..."
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "&Vidyoyu Farklı Kaydet..."
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "&Farklı Kaydet..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr ""
@@ -8331,18 +8287,14 @@ msgstr ""
 "#-#-#-#-#  tr.po (Wine)  #-#-#-#-#\n"
 "&Bul"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
+#: shell32.rc:233
 #, fuzzy
-msgid "OEM Links"
-msgstr "Bağlantılar"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr ""
+msgid "Downloads"
+msgstr "İndiriliyor..."
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8410,11 +8362,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -8431,26 +8383,26 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "Metin Dosyaları (*.txt)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "'%1' öğesini silmek istediğinizden emin misiniz?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Bu %1 öğeyi silmek istediğinizden emin misiniz?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Dosya silmeyi onayla"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8460,7 +8412,7 @@ msgstr ""
 "Dosya zaten var.\n"
 "Değiştirmek ister misiniz?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8470,12 +8422,12 @@ msgstr ""
 "Dosya zaten var.\n"
 "Değiştirmek ister misiniz?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Dosya Üzerine Yazmayı Onayla"
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8492,7 +8444,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 #, fuzzy
 msgid "Wine License"
 msgstr "Wine Mayın Tarlası"
@@ -11281,10 +11233,6 @@ msgstr "'%s' dosyası mevcut. Üzerine yazılmadı."
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Asıl dosya üzerine yazmayı engellemek için dosyayı '%s' adıyla kaydet."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Programlar"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Kitaplıklar (*.dll)"
@@ -13911,10 +13859,6 @@ msgstr "Yer İ&mleri"
 msgid "&Define..."
 msgstr "&Tanımla..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 #, fuzzy
 msgid "Fonts"
diff --git a/po/uk.po b/po/uk.po
index 48a62b4319c..70c506ca0ab 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -61,8 +61,8 @@ msgstr "Дані підтримки"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -144,7 +144,7 @@ msgstr "&Встановити"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -182,7 +182,7 @@ msgstr ""
 msgid "Not specified"
 msgstr "Не зазначено"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "Назва"
 
@@ -2525,7 +2525,7 @@ msgstr "Розширене використання ключа (властиві
 msgid "Friendly name"
 msgstr "Дружня назва"
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "Опис"
 
@@ -7726,51 +7726,51 @@ msgstr "В&ихід"
 msgid "&About Control Panel"
 msgstr "&Про панель керування"
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "Огляд до теки"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "Тека:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "&Зробити нову теку"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "Повідомлення"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Так"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "Так для &всіх"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Ні"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Про %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "&Ліцензія Wine"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "Працює на %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Розробники Wine:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
@@ -7778,11 +7778,11 @@ msgstr ""
 "Введіть ім'я програми, теки, документу чи ресурс Інтернету, і Wine відкриє "
 "їх."
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Відкрити:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "&Огляд"
@@ -7861,144 +7861,112 @@ msgstr "Вимкнути"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "Завершити сесію роботи Wine?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Головне меню\\Програми"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "Програми"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "Мої документи"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Обране"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Головне меню\\Програми\\Автозапуск"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Недавнє"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "Відіслати"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Головне меню"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "Моя Музика"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "Мої Фільми"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "Робочий стіл"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "Мережне оточення"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Шаблони"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "Принтери"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "Історія"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "Мої Малюнки"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Загальна назва"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Документи"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start Menu\\Programs\\Administrative Tools"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Музика"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Малюнки"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Фільми"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Program Files (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files (x86)\\Common Files"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Контакти"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Посилання"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Малюнки\\Слайд Покази"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Музика\\Плейлисти"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Завантаження"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "Стан"
@@ -8011,53 +7979,41 @@ msgstr "Розміщення"
 msgid "Model"
 msgstr "Модель"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Libraries"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Ringtones"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Музика\\Приклади Музики"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Малюнки\\Приклади Малюнків"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Музика\\Приклади Плейлистів"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Фільми\\Приклади Відео"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Збережені Ігри"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Пошуки"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Користувачі"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Посилання"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Завантаження"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8133,11 +8089,11 @@ msgstr ""
 "обраній теці, вони будуть замінені. Ви все ще бажаєте перемістити чи\n"
 "скопіювати теку?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "Нова Тека"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Панель керування Wine"
 
@@ -8153,26 +8109,26 @@ msgstr "Неможливо відобразити діалог Огляд (вн
 msgid "Executable files (*.exe)"
 msgstr "Виконувані Файли (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "Не сконфігуровано програми Windows для відкриття файлів цього типу."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "Ви впевнені, що хочете вилучити '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "Ви впевнені, що хочете вилучити ці %1 елементи(ів)?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Підтвердження вилучення файлу"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8182,7 +8138,7 @@ msgstr ""
 "Файл уже існує.\n"
 "Замінити його?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8192,12 +8148,12 @@ msgstr ""
 "Файл уже існує.\n"
 "Замінити його?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "Підтвердження Перезапису Файлу"
 
-#: shell32.rc:278
+#: shell32.rc:265
 #, fuzzy
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
@@ -8227,7 +8183,7 @@ msgstr ""
 "Wine; якщо ні, напишіть до Free Software Foundation, Inc., 51 Franklin St, "
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Ліцензія Wine"
 
@@ -10977,10 +10933,6 @@ msgstr "Файл `%s' існує. Він не був перезаписаний.
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "Група зберігається як `%s' щоб уникнути перезапис оригіналів."
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "Програми"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "Бібліотеки (*.dll)"
@@ -13646,10 +13598,6 @@ msgstr "&Закладка"
 msgid "&Define..."
 msgstr "&Задати..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "Історія"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "Шрифти"
diff --git a/po/wa.po b/po/wa.po
index 5db8ebb3c65..95bc5dc53f2 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -61,8 +61,8 @@ msgstr "Informåcion"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -141,7 +141,7 @@ msgstr "&Sicrîre..."
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -177,7 +177,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2511,7 +2511,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7659,61 +7659,61 @@ msgstr "Moussî &Foû"
 msgid "&About Control Panel"
 msgstr ""
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr ""
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "&Oyi"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "&Neni"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "Å dfait di %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine a estu fwait par:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "&Drovî:"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7793,143 +7793,108 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
-
-#: shell32.rc:200
-msgid "My Documents"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
 #: shell32.rc:201
-msgid "Favorites"
+msgid "My Documents"
 msgstr ""
 
 #: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
+msgid "Favorites"
 msgstr ""
 
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr ""
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 #, fuzzy
 msgid "PrintHood"
 msgstr "&Rexhe"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr ""
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "Å&dvins"
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 #, fuzzy
 msgid "Contacts"
 msgstr "Å&dvins"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7944,54 +7909,40 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "Egzimpe"
+
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "Egzimpe"
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "Schaper èt r&lomer..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "C&werî"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -8059,11 +8010,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -8080,41 +8031,41 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "Fitchîs tekse (*.txt)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8131,7 +8082,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -10549,10 +10500,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -13109,10 +13056,6 @@ msgstr "&Rimårkes"
 msgid "&Define..."
 msgstr "&Defini..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr ""
diff --git a/po/wine.pot b/po/wine.pot
index ea8efa80b87..8a18d176ac6 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -53,8 +53,8 @@ msgstr ""
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -129,7 +129,7 @@ msgstr ""
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -165,7 +165,7 @@ msgstr ""
 msgid "Not specified"
 msgstr ""
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr ""
 
@@ -2444,7 +2444,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr ""
 
@@ -7524,61 +7524,61 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr ""
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr ""
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr ""
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr ""
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr ""
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr ""
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr ""
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr ""
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr ""
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr ""
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr ""
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr ""
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr ""
@@ -7656,141 +7656,105 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
-
-#: shell32.rc:200
-msgid "My Documents"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
 msgstr ""
 
 #: shell32.rc:201
-msgid "Favorites"
+msgid "My Documents"
 msgstr ""
 
 #: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
+msgid "Favorites"
 msgstr ""
 
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 msgctxt "directory"
 msgid "Desktop"
 msgstr ""
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr ""
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr ""
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
 msgstr ""
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr ""
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr ""
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr ""
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
+#: shell32.rc:215
+msgid "Common Files"
 msgstr ""
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
-msgstr ""
-
-#: shell32.rc:224
-msgid "Music"
-msgstr ""
-
-#: shell32.rc:225
-msgid "Pictures"
-msgstr ""
-
-#: shell32.rc:226
-msgid "Videos"
-msgstr ""
-
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
 #: shell32.rc:218
+msgid "Music"
+msgstr ""
+
+#: shell32.rc:219
+msgid "Pictures"
+msgstr ""
+
+#: shell32.rc:220
+msgid "Videos"
+msgstr ""
+
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr ""
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
+#: shell32.rc:224
+msgid "Playlists"
 msgstr ""
 
 #: shell32.rc:148 taskmgr.rc:326
@@ -7805,52 +7769,36 @@ msgstr ""
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+msgid "Sample Music"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
+#: shell32.rc:226
+msgid "Sample Pictures"
 msgstr ""
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:228
+msgid "Sample Videos"
 msgstr ""
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr ""
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr ""
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr ""
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
 msgstr ""
 
 #: shell32.rc:166
@@ -7918,11 +7866,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr ""
 
@@ -7938,41 +7886,41 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr ""
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 msgid ""
 "A file already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:260
+#: shell32.rc:247
 msgid ""
 "A folder already exists at the path %1.\n"
 "\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -7989,7 +7937,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr ""
 
@@ -10372,10 +10320,6 @@ msgstr ""
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr ""
 
-#: progman.rc:80
-msgid "Programs"
-msgstr ""
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr ""
@@ -12870,10 +12814,6 @@ msgstr ""
 msgid "&Define..."
 msgstr ""
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr ""
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7a66a09a03d..e5cb4271c6e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -57,8 +57,8 @@ msgstr "技术支持信息"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -137,7 +137,7 @@ msgstr "安装(&I)"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -173,7 +173,7 @@ msgstr "不能运行卸载程序 '%s'. 你想把这个卸载程序从注册表
 msgid "Not specified"
 msgstr "没指定"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "名称"
 
@@ -2518,7 +2518,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "描述"
 
@@ -7927,61 +7927,61 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr "关于控制面板(&A)..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr "选择文件夹"
 
-#: shell32.rc:303
+#: shell32.rc:290
 msgid "Folder:"
 msgstr "文件夹:"
 
-#: shell32.rc:309
+#: shell32.rc:296
 msgid "&Make New Folder"
 msgstr "创建新文件夹 (&M)"
 
-#: shell32.rc:316
+#: shell32.rc:303
 msgid "Message"
 msgstr "消息"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "是(&Y)"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr "全部选是 (&A)"
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "否(&N)"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "关于 %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "使用许可(&L)"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "运行于 %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine 开发人员:"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr "输入程序，目录，文件或者Internet资源名，Wine将为您打开它。"
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "打开(&O):"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "浏览(&B)..."
@@ -8060,11 +8060,11 @@ msgstr "关闭"
 msgid "Do you want to shutdown your Wine session?"
 msgstr "要关闭 Wine 会话吗?"
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr "Start Menu\\Programs"
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "程序"
 
-#: shell32.rc:200
+#: shell32.rc:201
 #, fuzzy
 msgid "My Documents"
 msgstr ""
@@ -8073,136 +8073,104 @@ msgstr ""
 "#-#-#-#-#  zh_CN.po (Wine)  #-#-#-#-#\n"
 "我的文档"
 
-#: shell32.rc:201
+#: shell32.rc:202
 msgid "Favorites"
 msgstr "Favorites"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr "Start Menu\\Programs\\StartUp"
-
 #: shell32.rc:203
-msgid "Recent"
-msgstr "Recent"
+msgid "StartUp"
+msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr "SendTo"
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr "Start Menu"
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr "My Music"
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr "My Videos"
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "桌面"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr "NetHood"
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr "Templates"
 
-#: shell32.rc:211
-msgid "Application Data"
-msgstr "Application Data"
-
-#: shell32.rc:212
+#: shell32.rc:210
 msgid "PrintHood"
 msgstr "PrintHood"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr "Local Settings\\Application Data"
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "历史"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr "Local Settings\\Temporary Internet Files"
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr "Cookies"
-
-#: shell32.rc:216
-msgid "Local Settings\\History"
-msgstr "Local Settings\\History"
-
-#: shell32.rc:217
+#: shell32.rc:212
 msgid "Program Files"
 msgstr "Program Files"
 
-#: shell32.rc:219
+#: shell32.rc:214
 msgid "My Pictures"
 msgstr "My Pictures"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr "Program Files\\Common Files"
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "复制文件..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr "Documents"
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+#, fuzzy
+msgid "Administrative Tools"
 msgstr "Start Menu\\Programs\\Administrative Tools"
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr "Music"
 
-#: shell32.rc:225
+#: shell32.rc:219
 msgid "Pictures"
 msgstr "Pictures"
 
-#: shell32.rc:226
+#: shell32.rc:220
 msgid "Videos"
 msgstr "Videos"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr "Local Settings\\Application Data\\Microsoft\\CD Burning"
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr "Program Files (x86)"
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr "Program Files (x86)\\Common Files"
-
-#: shell32.rc:228
 msgid "Contacts"
 msgstr "Contacts"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr "Links"
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+#, fuzzy
+msgid "Slide Shows"
 msgstr "Pictures\\Slide Shows"
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
+#: shell32.rc:224
+#, fuzzy
+msgid "Playlists"
 msgstr "Music\\Playlists"
 
-#: shell32.rc:232 shell32.rc:245
-msgid "Downloads"
-msgstr "Downloads"
-
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
 msgstr "状态"
@@ -8215,53 +8183,41 @@ msgstr "位置"
 msgid "Model"
 msgstr "型号"
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
-msgstr "Microsoft\\Windows\\GameExplorer"
-
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr "Microsoft\\Windows\\Libraries"
-
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr "Microsoft\\Windows\\Ringtones"
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
 msgstr "Music\\Sample Music"
 
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
 msgstr "Pictures\\Sample Pictures"
 
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
+#: shell32.rc:227
+#, fuzzy
+msgid "Sample Playlists"
 msgstr "Music\\Sample Playlists"
 
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
 msgstr "Videos\\Sample Videos"
 
-#: shell32.rc:240
+#: shell32.rc:229
 msgid "Saved Games"
 msgstr "Saved Games"
 
-#: shell32.rc:241
+#: shell32.rc:230
 msgid "Searches"
 msgstr "Searches"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr "Users"
 
-#: shell32.rc:243
-msgid "OEM Links"
-msgstr "OEM Links"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr "AppData\\LocalLow"
+#: shell32.rc:233
+msgid "Downloads"
+msgstr "Downloads"
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8334,11 +8290,11 @@ msgstr ""
 "\n"
 "若选择合并原有同名文件将被替换. 真的要合并吗?"
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr "新文件夹"
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine 控制面板"
 
@@ -8354,26 +8310,26 @@ msgstr "无法显示浏览对话框 (内部错误)"
 msgid "Executable files (*.exe)"
 msgstr "可执行文件 (*.exe)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr "找不到用于打开此类文件的 Windows 程序."
 
-#: shell32.rc:256
+#: shell32.rc:243
 #, fuzzy
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr "真的删除 '%1'?"
 
-#: shell32.rc:257
+#: shell32.rc:244
 #, fuzzy
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr "真的删除这 %1 项?"
 
-#: shell32.rc:258
+#: shell32.rc:245
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "确认删除文件"
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8383,7 +8339,7 @@ msgstr ""
 "文件已经存在。\n"
 "是否替换？"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8393,12 +8349,12 @@ msgstr ""
 "文件已经存在。\n"
 "是否替换？"
 
-#: shell32.rc:261
+#: shell32.rc:248
 #, fuzzy
 msgid "Confirm overwrite"
 msgstr "确认覆盖文件"
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8415,7 +8371,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 msgid "Wine License"
 msgstr "Wine 使用许可"
 
@@ -10884,10 +10840,6 @@ msgstr "文件 %s 已经存在。不覆盖已有文件。"
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "将程序组保存为 %s 可以避免复盖已有的文件。"
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "程序"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "动态连接库 (*.dll)"
@@ -13513,10 +13465,6 @@ msgstr "书签(&B)"
 msgid "&Define..."
 msgstr "定义(&D)..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "历史"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "字体"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index af56c0cd4fb..2621f6bb936 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -57,8 +57,8 @@ msgstr "技術支援資訊"
 #: credui.rc:49 cryptui.rc:260 cryptui.rc:272 cryptui.rc:362 dinput.rc:43
 #: ieframe.rc:93 localui.rc:41 localui.rc:54 mpr.rc:46 msacm32.rc:50
 #: mshtml.rc:45 mshtml.rc:55 msvfw32.rc:33 oledlg.rc:55 oledlg.rc:87
-#: serialui.rc:38 setupapi.rc:56 shell32.rc:286 shell32.rc:310 shell32.rc:332
-#: shell32.rc:350 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
+#: serialui.rc:38 setupapi.rc:56 shell32.rc:273 shell32.rc:297 shell32.rc:319
+#: shell32.rc:337 shlwapi.rc:41 user32.rc:77 user32.rc:95 wininet.rc:48
 #: wininet.rc:68 winspool.rc:39 net.rc:44 notepad.rc:114 oleview.rc:159
 #: oleview.rc:172 progman.rc:103 progman.rc:121 progman.rc:139 progman.rc:155
 #: progman.rc:177 progman.rc:196 progman.rc:213 regedit.rc:244 regedit.rc:255
@@ -136,7 +136,7 @@ msgstr "安裝(&I)"
 #: dinput.rc:44 ieframe.rc:94 inetcpl.rc:78 localui.rc:42 localui.rc:55
 #: mpr.rc:47 msacm32.rc:51 mshtml.rc:46 mshtml.rc:56 msvfw32.rc:34
 #: oledlg.rc:56 oledlg.rc:88 serialui.rc:39 setupapi.rc:39 setupapi.rc:57
-#: shell32.rc:287 shell32.rc:311 shell32.rc:322 shell32.rc:351 shlwapi.rc:42
+#: shell32.rc:274 shell32.rc:298 shell32.rc:309 shell32.rc:338 shlwapi.rc:42
 #: user32.rc:78 user32.rc:96 wininet.rc:49 wininet.rc:69 winspool.rc:40
 #: notepad.rc:115 oleview.rc:160 oleview.rc:173 progman.rc:104 progman.rc:122
 #: progman.rc:140 progman.rc:156 progman.rc:178 progman.rc:197 progman.rc:214
@@ -172,7 +172,7 @@ msgstr "不能執行卸載程式 '%s'. 你想把這個卸載程式從註冊表
 msgid "Not specified"
 msgstr "沒指定"
 
-#: appwiz.rc:35 shell32.rc:141 shell32.rc:251 regedit.rc:122 winefile.rc:110
+#: appwiz.rc:35 shell32.rc:141 shell32.rc:238 regedit.rc:122 winefile.rc:110
 msgid "Name"
 msgstr "名稱"
 
@@ -2544,7 +2544,7 @@ msgstr ""
 msgid "Friendly name"
 msgstr ""
 
-#: cryptui.rc:62 shell32.rc:252 ipconfig.rc:41
+#: cryptui.rc:62 shell32.rc:239 ipconfig.rc:41
 msgid "Description"
 msgstr "描述"
 
@@ -7969,64 +7969,64 @@ msgstr ""
 msgid "&About Control Panel"
 msgstr "關於控制面板(&A)..."
 
-#: shell32.rc:283 shell32.rc:298
+#: shell32.rc:270 shell32.rc:285
 msgid "Browse for Folder"
 msgstr ""
 
-#: shell32.rc:303
+#: shell32.rc:290
 #, fuzzy
 msgid "Folder:"
 msgstr "特殊資料夾"
 
-#: shell32.rc:309
+#: shell32.rc:296
 #, fuzzy
 msgid "&Make New Folder"
 msgstr "建立新資料夾"
 
-#: shell32.rc:316
+#: shell32.rc:303
 #, fuzzy
 msgid "Message"
 msgstr "內存用量"
 
-#: shell32.rc:319 shlwapi.rc:43 user32.rc:82
+#: shell32.rc:306 shlwapi.rc:43 user32.rc:82
 msgid "&Yes"
 msgstr "是(&Y)"
 
-#: shell32.rc:320
+#: shell32.rc:307
 msgid "Yes to &all"
 msgstr ""
 
-#: shell32.rc:321 shlwapi.rc:44 user32.rc:83
+#: shell32.rc:308 shlwapi.rc:44 user32.rc:83
 msgid "&No"
 msgstr "否(&N)"
 
-#: shell32.rc:329
+#: shell32.rc:316
 msgid "About %s"
 msgstr "關於 %s"
 
-#: shell32.rc:333
+#: shell32.rc:320
 msgid "Wine &license"
 msgstr "使用許可(&l)"
 
-#: shell32.rc:338
+#: shell32.rc:325
 msgid "Running on %s"
 msgstr "運行於 %s"
 
-#: shell32.rc:339
+#: shell32.rc:326
 msgid "Wine was brought to you by:"
 msgstr "Wine 開發人員 :"
 
-#: shell32.rc:347
+#: shell32.rc:334
 msgid ""
 "Type the name of a program, folder, document, or Internet resource, and Wine "
 "will open it for you."
 msgstr "輸入程式，目錄，檔案或者Internet資源名，Wine將為您開啟它。"
 
-#: shell32.rc:348
+#: shell32.rc:335
 msgid "&Open:"
 msgstr "打開(&O):"
 
-#: shell32.rc:352 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
+#: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234
 #: winefile.rc:136
 msgid "&Browse..."
 msgstr "瀏覽(&B)..."
@@ -8110,153 +8110,116 @@ msgstr ""
 msgid "Do you want to shutdown your Wine session?"
 msgstr ""
 
-#: shell32.rc:199
-msgid "Start Menu\\Programs"
-msgstr ""
+#: shell32.rc:200 progman.rc:80
+msgid "Programs"
+msgstr "程式"
 
-#: shell32.rc:200
+#: shell32.rc:201
 msgid "My Documents"
 msgstr "我的檔案"
 
-#: shell32.rc:201
+#: shell32.rc:202
 #, fuzzy
 msgid "Favorites"
 msgstr "最愛(&I)"
 
-#: shell32.rc:202
-msgid "Start Menu\\Programs\\StartUp"
-msgstr ""
-
 #: shell32.rc:203
-msgid "Recent"
+msgid "StartUp"
 msgstr ""
 
 #: shell32.rc:204
-msgid "SendTo"
-msgstr ""
-
-#: shell32.rc:205
 msgid "Start Menu"
 msgstr ""
 
-#: shell32.rc:206
+#: shell32.rc:205
 msgid "My Music"
 msgstr ""
 
-#: shell32.rc:207
+#: shell32.rc:206
 msgid "My Videos"
 msgstr ""
 
-#: shell32.rc:208
+#: shell32.rc:207
 #, fuzzy
 msgctxt "directory"
 msgid "Desktop"
 msgstr "桌面"
 
-#: shell32.rc:209
+#: shell32.rc:208
 msgid "NetHood"
 msgstr ""
 
-#: shell32.rc:210
+#: shell32.rc:209
 msgid "Templates"
 msgstr ""
 
-#: shell32.rc:211
-#, fuzzy
-msgid "Application Data"
-msgstr "運用程式"
-
-#: shell32.rc:212
+#: shell32.rc:210
 #, fuzzy
 msgid "PrintHood"
 msgstr "列印"
 
-#: shell32.rc:213
-msgid "Local Settings\\Application Data"
-msgstr ""
+#: shell32.rc:211 winhlp32.rc:45
+msgid "History"
+msgstr "歷史"
 
-#: shell32.rc:214
-msgid "Local Settings\\Temporary Internet Files"
-msgstr ""
-
-#: shell32.rc:215
-msgid "Cookies"
-msgstr ""
-
-#: shell32.rc:216
-#, fuzzy
-msgid "Local Settings\\History"
-msgstr "本地監視器"
-
-#: shell32.rc:217
+#: shell32.rc:212
 #, fuzzy
 msgid "Program Files"
 msgstr "程式"
 
-#: shell32.rc:219
+#: shell32.rc:214
 #, fuzzy
 msgid "My Pictures"
 msgstr "到我的圖片(&G)"
 
-#: shell32.rc:220
-msgid "Program Files\\Common Files"
-msgstr ""
+#: shell32.rc:215
+#, fuzzy
+msgid "Common Files"
+msgstr "複製檔案..."
 
-#: shell32.rc:222 shell32.rc:147 shell32.rc:244
+#: shell32.rc:216 shell32.rc:147 shell32.rc:232
 msgid "Documents"
 msgstr ""
 
-#: shell32.rc:223
-msgid "Start Menu\\Programs\\Administrative Tools"
+#: shell32.rc:217
+msgid "Administrative Tools"
 msgstr ""
 
-#: shell32.rc:224
+#: shell32.rc:218
 msgid "Music"
 msgstr ""
 
-#: shell32.rc:225
+#: shell32.rc:219
 #, fuzzy
 msgid "Pictures"
 msgstr "顯示圖片(&S)"
 
-#: shell32.rc:226
+#: shell32.rc:220
 #, fuzzy
 msgid "Videos"
 msgstr "視頻"
 
-#: shell32.rc:227
-msgid "Local Settings\\Application Data\\Microsoft\\CD Burning"
-msgstr ""
-
-#: shell32.rc:218
+#: shell32.rc:213
 msgid "Program Files (x86)"
 msgstr ""
 
 #: shell32.rc:221
-msgid "Program Files (x86)\\Common Files"
-msgstr ""
-
-#: shell32.rc:228
 #, fuzzy
 msgid "Contacts"
 msgstr "內容(&C)"
 
-#: shell32.rc:229 winefile.rc:116
+#: shell32.rc:222 winefile.rc:116
 msgid "Links"
 msgstr ""
 
-#: shell32.rc:230
-msgid "Pictures\\Slide Shows"
+#: shell32.rc:223
+msgid "Slide Shows"
 msgstr ""
 
-#: shell32.rc:231
-msgid "Music\\Playlists"
-msgstr ""
-
-#: shell32.rc:232 shell32.rc:245
+#: shell32.rc:224
 #, fuzzy
-msgid "Downloads"
-msgstr "正在下載..."
+msgid "Playlists"
+msgstr "播放"
 
 #: shell32.rc:148 taskmgr.rc:326
 msgid "Status"
@@ -8271,56 +8234,43 @@ msgstr "區域網路連線"
 msgid "Model"
 msgstr ""
 
-#: shell32.rc:233
-msgid "Microsoft\\Windows\\GameExplorer"
+#: shell32.rc:225
+#, fuzzy
+msgid "Sample Music"
+msgstr "範例"
+
+#: shell32.rc:226
+#, fuzzy
+msgid "Sample Pictures"
+msgstr "將圖片存為(&A)"
+
+#: shell32.rc:227
+msgid "Sample Playlists"
 msgstr ""
 
-#: shell32.rc:234
-msgid "Microsoft\\Windows\\Libraries"
-msgstr ""
+#: shell32.rc:228
+#, fuzzy
+msgid "Sample Videos"
+msgstr "將視頻存為(&V)..."
 
-#: shell32.rc:235
-msgid "Microsoft\\Windows\\Ringtones"
-msgstr ""
-
-#: shell32.rc:236
-msgid "Music\\Sample Music"
-msgstr ""
-
-#: shell32.rc:237
-msgid "Pictures\\Sample Pictures"
-msgstr ""
-
-#: shell32.rc:238
-msgid "Music\\Sample Playlists"
-msgstr ""
-
-#: shell32.rc:239
-msgid "Videos\\Sample Videos"
-msgstr ""
-
-#: shell32.rc:240
+#: shell32.rc:229
 #, fuzzy
 msgid "Saved Games"
 msgstr "另存為(&A)..."
 
-#: shell32.rc:241
+#: shell32.rc:230
 #, fuzzy
 msgid "Searches"
 msgstr "搜尋(&S)"
 
-#: shell32.rc:242
+#: shell32.rc:231
 msgid "Users"
 msgstr ""
 
-#: shell32.rc:243
+#: shell32.rc:233
 #, fuzzy
-msgid "OEM Links"
-msgstr "開啟鏈接(&O)"
-
-#: shell32.rc:246
-msgid "AppData\\LocalLow"
-msgstr ""
+msgid "Downloads"
+msgstr "正在下載..."
 
 #: shell32.rc:166
 msgid "Unable to create new Folder: Permission denied."
@@ -8387,11 +8337,11 @@ msgid ""
 "the folder?"
 msgstr ""
 
-#: shell32.rc:248
+#: shell32.rc:235
 msgid "New Folder"
 msgstr ""
 
-#: shell32.rc:250
+#: shell32.rc:237
 msgid "Wine Control Panel"
 msgstr "Wine 控制面板"
 
@@ -8408,23 +8358,23 @@ msgstr ""
 msgid "Executable files (*.exe)"
 msgstr "文本檔案 (*.txt)"
 
-#: shell32.rc:254
+#: shell32.rc:241
 msgid "There is no Windows program configured to open this type of file."
 msgstr ""
 
-#: shell32.rc:256
+#: shell32.rc:243
 msgid "Are you sure you wish to permanently delete '%1'?"
 msgstr ""
 
-#: shell32.rc:257
+#: shell32.rc:244
 msgid "Are you sure you wish to permanently delete these %1 items?"
 msgstr ""
 
-#: shell32.rc:258
+#: shell32.rc:245
 msgid "Confirm deletion"
 msgstr ""
 
-#: shell32.rc:259
+#: shell32.rc:246
 #, fuzzy
 msgid ""
 "A file already exists at the path %1.\n"
@@ -8434,7 +8384,7 @@ msgstr ""
 "檔案已經存在。\n"
 "要替換嗎?"
 
-#: shell32.rc:260
+#: shell32.rc:247
 #, fuzzy
 msgid ""
 "A folder already exists at the path %1.\n"
@@ -8444,11 +8394,11 @@ msgstr ""
 "檔案已經存在。\n"
 "要替換嗎?"
 
-#: shell32.rc:261
+#: shell32.rc:248
 msgid "Confirm overwrite"
 msgstr ""
 
-#: shell32.rc:278
+#: shell32.rc:265
 msgid ""
 "Wine is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU Lesser General Public License as published by the Free "
@@ -8465,7 +8415,7 @@ msgid ""
 "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: shell32.rc:266
+#: shell32.rc:253
 #, fuzzy
 msgid "Wine License"
 msgstr "Wine地雷"
@@ -10943,10 +10893,6 @@ msgstr "檔案 %s 已經存在。不覆蓋已有檔案。"
 msgid "Save group as `%s to prevent overwriting original files."
 msgstr "將程式組儲存為 %s 可以避免復蓋已有的檔案。"
 
-#: progman.rc:80
-msgid "Programs"
-msgstr "程式"
-
 #: progman.rc:81
 msgid "Libraries (*.dll)"
 msgstr "動態連接庫 (*.dll)"
@@ -13581,10 +13527,6 @@ msgstr "書籤(&B)"
 msgid "&Define..."
 msgstr "定義(&D)..."
 
-#: winhlp32.rc:45
-msgid "History"
-msgstr "歷史"
-
 #: winhlp32.rc:46 winhlp32.rc:67
 msgid "Fonts"
 msgstr "字型"