Made some shell32 resources LANG_ENGLISH instead of LANG_NEUTRAL for easier localisation. Changelog: Extract localisable resources from shell32's shres.rc to proper language file. Vincent
Index: shell32_En.rc =================================================================== RCS file: /home/wine/wine/dlls/shell32/shell32_En.rc,v retrieving revision 1.8 diff -u -r1.8 shell32_En.rc --- shell32_En.rc 23 Oct 2002 23:34:33 -0000 1.8 +++ shell32_En.rc 29 Sep 2003 01:10:56 -0000 @@ -18,6 +18,92 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON + MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON + MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP"" + BEGIN + POPUP "&View" + BEGIN + MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON + MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON + MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Arrange &Icons" + BEGIN + MENUITEM "By &Name", 0x30 /* column 0 */ + MENUITEM "By &Type", 0x32 /* column 2 */ + MENUITEM "By &Size", 0x31 /* ... */ + MENUITEM "By &Date", 0x33 + MENUITEM SEPARATOR + MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Paste", FCIDM_SHVIEW_INSERT + MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "New" + BEGIN + MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP"" + BEGIN + MENUITEM "E&xplore", FCIDM_SHVIEW_CUT + MENUITEM "&Open", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "C&ut", FCIDM_SHVIEW_CUT + MENUITEM "&Copy", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "&Create Link", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Delete", FCIDM_SHVIEW_DELETE + MENUITEM "&Rename", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Browse for Folder" +FONT 8, "Helv" +{ + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "About %s" @@ -44,8 +130,42 @@ PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP } +/* + special folders +*/ +STRINGTABLE DISCARDABLE +{ + IDS_DESKTOP "Desktop" + IDS_MYCOMPUTER "My Computer" +} + +/* + context menus +*/ +STRINGTABLE DISCARDABLE +{ + IDS_VIEW_LARGE "Lar&ge Icons" + IDS_VIEW_SMALL "S&mall Icons" + IDS_VIEW_LIST "&List" + IDS_VIEW_DETAILS "&Details" + IDS_SELECT "Select" + IDS_OPEN "Open" +} + +STRINGTABLE DISCARDABLE +{ + IDS_CREATEFOLDER_DENIED "Can not create new Folder: Permission denied." + IDS_CREATEFOLDER_CAPTION "Error during creating a new folder" + IDS_DELETEITEM_CAPTION "Confirm file delete" + IDS_DELETEFOLDER_CAPTION "Confirm folder delete" + IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" + IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" + IDS_OVERWRITEFILE_TEXT "OverWrite File %1?" + IDS_OVERWRITEFILE_CAPTION "Confirm File OverWrite" +} + /* columns in the shellview */ -STRINGTABLE LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +STRINGTABLE BEGIN IDS_SHV_COLUMN1 "File" IDS_SHV_COLUMN2 "Size" Index: shell32_Fr.rc =================================================================== RCS file: /home/wine/wine/dlls/shell32/shell32_Fr.rc,v retrieving revision 1.6 diff -u -r1.6 shell32_Fr.rc --- shell32_Fr.rc 22 Sep 2003 21:16:57 -0000 1.6 +++ shell32_Fr.rc 29 Sep 2003 01:10:56 -0000 @@ -21,6 +21,92 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&Grands icônes", FCIDM_SHVIEW_BIGICON + MENUITEM "&Petits icônes", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Détails", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&Affichage" + BEGIN + MENUITEM "&Grands icônes", FCIDM_SHVIEW_BIGICON + MENUITEM "&Petits icônes", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Détails", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Trier les &icônes" + BEGIN + MENUITEM "Par &nom", 0x30 /* column 0 */ + MENUITEM "Par &type", 0x32 /* column 2 */ + MENUITEM "Par t&aille", 0x31 /* ... */ + MENUITEM "Par &date", 0x33 + MENUITEM SEPARATOR + MENUITEM "T&ri automatique", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "Aligner les icônes", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "Rafraîchir", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "Coller", FCIDM_SHVIEW_INSERT + MENUITEM "Coller comme un lien", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "Nouveau" + BEGIN + MENUITEM "Nouveau d&ossier", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Nouveau &lien", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "Propriétés", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "E&xplorer", FCIDM_SHVIEW_CUT + MENUITEM "&Ouvrir", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "C&ouper", FCIDM_SHVIEW_CUT + MENUITEM "&Copier", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "Créer un &lien", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Supprimer", FCIDM_SHVIEW_DELETE + MENUITEM "&Renommer", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "&Propriétés", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Parcourir" +FONT 8, "Helv" +{ + DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuler", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "À propos de %s" @@ -45,6 +131,40 @@ DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Parcourir...", 12288, 170, 63, 50, 14, WS_TABSTOP +} + +/* + special folders +*/ +STRINGTABLE DISCARDABLE +{ + IDS_DESKTOP "Bureau" + IDS_MYCOMPUTER "Poste de travail" +} + +/* + context menus +*/ +STRINGTABLE DISCARDABLE +{ + IDS_VIEW_LARGE "&Grands icônes" + IDS_VIEW_SMALL "&Petits icônes" + IDS_VIEW_LIST "&Liste" + IDS_VIEW_DETAILS "&Détails" + IDS_SELECT "Sélectionner" + IDS_OPEN "Ouvrir" +} + +STRINGTABLE DISCARDABLE +{ + IDS_CREATEFOLDER_DENIED "Impossible de créer le nouveau dossier : permission refusée." + IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier" + IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier" + IDS_DELETEFOLDER_CAPTION "Confirmer la suppression du dossier" + IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer '%1'?" + IDS_DELETEMULTIPLE_TEXT "Êtes-vous sût de vouloir supprimer ces %1 items ?" + IDS_OVERWRITEFILE_TEXT "Écraser le fichier %1?" + IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier" } /* columns in the shellview */ Index: shres.rc =================================================================== RCS file: /home/wine/wine/dlls/shell32/shres.rc,v retrieving revision 1.29 diff -u -r1.29 shres.rc --- shres.rc 5 Sep 2003 23:08:30 -0000 1.29 +++ shres.rc 29 Sep 2003 01:10:56 -0000 @@ -36,127 +36,7 @@ * Don't localize it yet. (js) */ -LANGUAGE 0,0 - -MENU_001 MENU DISCARDABLE -BEGIN - MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON - MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW -END - -/* - shellview background menu -*/ -MENU_002 MENU DISCARDABLE -BEGIN - POPUP"" - BEGIN - POPUP "&View" - BEGIN - MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON - MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW - END - MENUITEM SEPARATOR - POPUP "Arrange &Icons" - BEGIN - MENUITEM "By &Name", 0x30 /* column 0 */ - MENUITEM "By &Type", 0x32 /* column 2 */ - MENUITEM "By &Size", 0x31 /* ... */ - MENUITEM "By &Date", 0x33 - MENUITEM SEPARATOR - MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE - END - MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID - MENUITEM SEPARATOR - MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH - MENUITEM SEPARATOR - MENUITEM "Paste", FCIDM_SHVIEW_INSERT - MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK - MENUITEM SEPARATOR - POPUP "New" - BEGIN - MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK - MENUITEM SEPARATOR - END - MENUITEM SEPARATOR - MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES - END -END - -/* - shellview item menu -*/ -MENU_SHV_FILE MENU DISCARDABLE -BEGIN - POPUP"" - BEGIN - MENUITEM "E&xplore", FCIDM_SHVIEW_CUT - MENUITEM "&Open", FCIDM_SHVIEW_COPY - MENUITEM SEPARATOR - MENUITEM "C&ut", FCIDM_SHVIEW_CUT - MENUITEM "&Copy", FCIDM_SHVIEW_COPY - MENUITEM SEPARATOR - MENUITEM "&Create Link", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Delete", FCIDM_SHVIEW_DELETE - MENUITEM "&Rename", FCIDM_SHVIEW_RENAME - MENUITEM SEPARATOR - MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES - END -END - -SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK -CAPTION "Browse for Folder" -FONT 8, "Helv" -{ - DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDD_TITLE, 4, 4, 180, 12 - LTEXT "", IDD_STATUS, 4, 25, 180, 12 - CONTROL "", IDD_TREEVIEW, "SysTreeView32", - TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | - WS_BORDER | WS_TABSTOP, - 4, 40, 180, 120 -} - -/* - special folders -*/ -STRINGTABLE DISCARDABLE -{ - IDS_DESKTOP "Desktop" - IDS_MYCOMPUTER "My Computer" -} - -/* - context menus -*/ -STRINGTABLE DISCARDABLE -{ - IDS_VIEW_LARGE "Lar&ge Icons" - IDS_VIEW_SMALL "S&mall Icons" - IDS_VIEW_LIST "&List" - IDS_VIEW_DETAILS "&Details" - IDS_SELECT "Select" - IDS_OPEN "Open" -} - -STRINGTABLE DISCARDABLE -{ - IDS_CREATEFOLDER_DENIED "Can not create new Folder: Permission denied." - IDS_CREATEFOLDER_CAPTION "Error during creating a new folder" - IDS_DELETEITEM_CAPTION "Confirm file delete" - IDS_DELETEFOLDER_CAPTION "Confirm folder delete" - IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" - IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" - IDS_OVERWRITEFILE_TEXT "OverWrite File %1?" - IDS_OVERWRITEFILE_CAPTION "Confirm File OverWrite" -} +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL shv_accel ACCELERATORS BEGIN