Sync winefile to Wine 1.2 RC3

svn path=/trunk/; revision=47778
This commit is contained in:
Daniel Reimer 2010-06-14 10:49:56 +00:00
parent 5dbfbb5201
commit 59ed163b9e
3 changed files with 28 additions and 27 deletions

View file

@ -22,6 +22,8 @@
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
#pragma code_page(65001)
/* Menu */ /* Menu */
IDM_WINEFILE MENU FIXED IMPURE IDM_WINEFILE MENU FIXED IMPURE
@ -29,8 +31,8 @@ IDM_WINEFILE MENU FIXED IMPURE
POPUP "&Bestand" { POPUP "&Bestand" {
MENUITEM "&Openen\tEnter", ID_ACTIVATE MENUITEM "&Openen\tEnter", ID_ACTIVATE
MENUITEM "&Verplaatsen...\tF7", ID_FILE_MOVE MENUITEM "&Verplaatsen...\tF7", ID_FILE_MOVE
MENUITEM "&Kopiëren...\tF8", ID_FILE_COPY MENUITEM "&Kopiëren...\tF8", ID_FILE_COPY
MENUITEM "Naar &klembord...\tF9", 118 MENUITEM "Naar klem&bord...\tF9", 118
MENUITEM "Ver&wijderen\tDel", ID_FILE_DELETE MENUITEM "Ver&wijderen\tDel", ID_FILE_DELETE
MENUITEM "&Naam wijzigen...", 109 MENUITEM "&Naam wijzigen...", 109
MENUITEM "&Eigenschappen...\tAlt+Enter",ID_EDIT_PROPERTIES MENUITEM "&Eigenschappen...\tAlt+Enter",ID_EDIT_PROPERTIES
@ -44,22 +46,22 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Nieuwe &map...", 111 MENUITEM "Nieuwe &map...", 111
MENUITEM "&Zoeken...", 104 MENUITEM "&Zoeken...", 104
MENUITEM "Bestanden &selecteren...", 116 MENUITEM "Bestanden s&electeren...", 116
MENUITEM SEPARATOR MENUITEM SEPARATOR
#ifndef _NO_EXTENSIONS #ifndef _NO_EXTENSIONS
MENUITEM "A&fsluiten\tAlt+X", ID_FILE_EXIT MENUITEM "&Afsluiten\tAlt+X", ID_FILE_EXIT
#else #else
MENUITEM "A&fsluiten", ID_FILE_EXIT MENUITEM "&Afsluiten", ID_FILE_EXIT
#endif #endif
} }
POPUP "&Disk" { POPUP "&Disk" {
MENUITEM "Disk &kopiëren...", 201 MENUITEM "Schijf &kopiëren...", 201
MENUITEM "Disklabel maken...", 202 MENUITEM "Schijflabel maken...", 202
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Disk &formatteren...", ID_FORMAT_DISK MENUITEM "Schijf &formatteren...", ID_FORMAT_DISK
#ifdef _WIN95 #ifdef _WIN95
MENUITEM "Systeemdisk maken...", -1 /*TODO*/ MENUITEM "Systeemschijf maken...", -1 /*TODO*/
#endif #endif
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Verbinding &maken met netwerkchijf",ID_CONNECT_NETWORK_DRIVE MENUITEM "Verbinding &maken met netwerkchijf",ID_CONNECT_NETWORK_DRIVE
@ -81,8 +83,8 @@ IDM_WINEFILE MENU FIXED IMPURE
} }
POPUP "&Beeld" { POPUP "&Beeld" {
MENUITEM "&Hierarchie en mapinhoud", 413 MENUITEM "&Hiërarchie en mapinhoud", 413
MENUITEM "&Alleen hierarchie", 411 MENUITEM "Alleen h&iërarchie", 411
MENUITEM "Alleen &mapinhoud", 412 MENUITEM "Alleen &mapinhoud", 412
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Sp&litsen", ID_VIEW_SPLIT MENUITEM "Sp&litsen", ID_VIEW_SPLIT
@ -91,7 +93,7 @@ IDM_WINEFILE MENU FIXED IMPURE
MENUITEM "&Alle details", ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&Alle details", ID_VIEW_ALL_ATTRIBUTES, CHECKED
MENUITEM "&Gedeeltelijke details...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM "&Gedeeltelijke details...", ID_VIEW_SELECTED_ATTRIBUTES
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "Sorteer op &naam", ID_VIEW_SORT_NAME MENUITEM "&Sorteer op naam", ID_VIEW_SORT_NAME
MENUITEM "Sorteer op &type", ID_VIEW_SORT_TYPE MENUITEM "Sorteer op &type", ID_VIEW_SORT_TYPE
MENUITEM "Sorteer op &grootte", ID_VIEW_SORT_SIZE MENUITEM "Sorteer op &grootte", ID_VIEW_SORT_SIZE
MENUITEM "Sorteer op &datum", ID_VIEW_SORT_DATE MENUITEM "Sorteer op &datum", ID_VIEW_SORT_DATE
@ -102,10 +104,10 @@ IDM_WINEFILE MENU FIXED IMPURE
POPUP "&Opties" { POPUP "&Opties" {
MENUITEM "&Bevestiging...", 501 MENUITEM "&Bevestiging...", 501
MENUITEM "&Lettertype...", ID_SELECT_FONT MENUITEM "&Lettertype...", ID_SELECT_FONT
MENUITEM "Gereedschappenbalk &aanpassen...", 512 MENUITEM "Gereedschapsbalk &aanpassen...", 512
MENUITEM SEPARATOR MENUITEM SEPARATOR
MENUITEM "&Gereedschappenbalk", ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Gereedschapsbalk", ID_VIEW_TOOL_BAR, CHECKED
MENUITEM "&Schijvenbalk", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "&Schijfbalk", ID_VIEW_DRIVE_BAR, CHECKED
MENUITEM "S&tatusbalk", ID_VIEW_STATUSBAR, CHECKED MENUITEM "S&tatusbalk", ID_VIEW_STATUSBAR, CHECKED
#ifndef _NO_EXTENSIONS #ifndef _NO_EXTENSIONS
MENUITEM "&Volledig scherm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN MENUITEM "&Volledig scherm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN
@ -123,7 +125,7 @@ IDM_WINEFILE MENU FIXED IMPURE
} }
POPUP "&Venster" { POPUP "&Venster" {
MENUITEM "Nieuw &venster", ID_WINDOW_NEW MENUITEM "&Nieuw venster", ID_WINDOW_NEW
MENUITEM "Trapsgewijs\tCtrl+F5", ID_WINDOW_CASCADE MENUITEM "Trapsgewijs\tCtrl+F5", ID_WINDOW_CASCADE
MENUITEM "&Boven elkaar", ID_WINDOW_TILE_HORZ MENUITEM "&Boven elkaar", ID_WINDOW_TILE_HORZ
MENUITEM "&Naast elkaar\tCtrl+F4", ID_WINDOW_TILE_VERT MENUITEM "&Naast elkaar\tCtrl+F4", ID_WINDOW_TILE_VERT
@ -164,15 +166,15 @@ BEGIN
LTEXT "&Naam:",-1,7,8,22,10 LTEXT "&Naam:",-1,7,8,22,10
EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL
GROUPBOX "Bestandstype",-1,7,23,87,56 GROUPBOX "Bestandstype",-1,7,23,87,56
CONTROL "&Directories",IDC_VIEW_TYPE_DIRECTORIES,"Button", CONTROL "&Mappen",IDC_VIEW_TYPE_DIRECTORIES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10
CONTROL "&Programma's",IDC_VIEW_TYPE_PROGRAMS,"Button", CONTROL "&Programma's",IDC_VIEW_TYPE_PROGRAMS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10
CONTROL "Docu&menten",IDC_VIEW_TYPE_DOCUMENTS,"Button", CONTROL "Do&cumenten",IDC_VIEW_TYPE_DOCUMENTS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10
CONTROL "&Overige bestanden",IDC_VIEW_TYPE_OTHERS,"Button", CONTROL "&Overige bestanden",IDC_VIEW_TYPE_OTHERS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10
CONTROL "Toon Verborgen/&Systeem Bestanden",IDC_VIEW_TYPE_HIDDEN, CONTROL "Toon verborgen/&systeembestanden",IDC_VIEW_TYPE_HIDDEN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9
DEFPUSHBUTTON "OK",IDOK,104,7,50,14 DEFPUSHBUTTON "OK",IDOK,104,7,50,14
PUSHBUTTON "Annuleren",IDCANCEL,104,24,50,14 PUSHBUTTON "Annuleren",IDCANCEL,104,24,50,14
@ -187,9 +189,9 @@ BEGIN
PUSHBUTTON "Annuleren",IDCANCEL,191,29,50,14 PUSHBUTTON "Annuleren",IDCANCEL,191,29,50,14
LTEXT "&Bestandsnaam:",-1,7,7,59,9 LTEXT "&Bestandsnaam:",-1,7,7,59,9
EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP
LTEXT "Volledig &Pad:",-1,7,18,59,9 LTEXT "Volledig &pad:",-1,7,18,59,9
EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP
LTEXT "Laatste Wijziging:",-1,7,29,59,9 LTEXT "Laatste wijziging:",-1,7,29,59,9
EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP
LTEXT "Versie:",-1,7,40,59,9 LTEXT "Versie:",-1,7,40,59,9
EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP
@ -198,12 +200,12 @@ BEGIN
LTEXT "Grootte:",-1,7,62,59,9 LTEXT "Grootte:",-1,7,62,59,9
EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP
GROUPBOX "Attributen",-1,7,79,158,46 GROUPBOX "Attributen",-1,7,79,158,46
CONTROL "A&lleen Lezen",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 CONTROL "A&lleen-lezen",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9
CONTROL "V&erborgen",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 CONTROL "V&erborgen",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9
CONTROL "&Archiveren",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 CONTROL "&Archiveren",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9
CONTROL "&Systeem",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 CONTROL "&Systeem",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9
CONTROL "Ge&comprimeerd",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 CONTROL "Ge&comprimeerd",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9
GROUPBOX "&Versie Informatie",-1,7,129,234,79 GROUPBOX "&Versie-informatie",-1,7,129,234,79
LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
END END
@ -225,7 +227,7 @@ STRINGTABLE
IDS_SHELL "Shell" IDS_SHELL "Shell"
IDS_TITLEFMT "%s - %s" IDS_TITLEFMT "%s - %s"
IDS_NO_IMPL "Nog niet geimplementeerd" IDS_NO_IMPL "Nog niet geimplementeerd"
IDS_WINE_FILE "Wine File" IDS_WINE_FILE "Winefile"
} }
STRINGTABLE STRINGTABLE

View file

@ -58,7 +58,6 @@ IDB_IMAGES BITMAP DISCARDABLE images.bmp
#include "Es.rc" #include "Es.rc"
#include "Hu.rc" #include "Hu.rc"
#include "Ko.rc" #include "Ko.rc"
#include "Nl.rc"
#include "No.rc" #include "No.rc"
#include "Pl.rc" #include "Pl.rc"
#include "Sv.rc" #include "Sv.rc"
@ -70,6 +69,7 @@ IDB_IMAGES BITMAP DISCARDABLE images.bmp
#include "It.rc" #include "It.rc"
#include "Ja.rc" #include "Ja.rc"
#include "Lt.rc" #include "Lt.rc"
#include "Nl.rc"
#include "Pt.rc" #include "Pt.rc"
#include "Ru.rc" #include "Ru.rc"
#include "Si.rc" #include "Si.rc"

View file

@ -4505,7 +4505,6 @@ static void InitInstance(HINSTANCE hinstance)
WNDCLASSEXW wcFrame; WNDCLASSEXW wcFrame;
WNDCLASSW wcChild; WNDCLASSW wcChild;
ATOM hChildClass;
int col; int col;
INITCOMMONCONTROLSEX icc = { INITCOMMONCONTROLSEX icc = {
@ -4551,7 +4550,7 @@ static void InitInstance(HINSTANCE hinstance)
wcChild.lpszMenuName = 0; wcChild.lpszMenuName = 0;
wcChild.lpszClassName = sWINEFILETREE; wcChild.lpszClassName = sWINEFILETREE;
hChildClass = RegisterClassW(&wcChild); RegisterClassW(&wcChild);
Globals.haccel = LoadAcceleratorsW(hinstance, MAKEINTRESOURCEW(IDA_WINEFILE)); Globals.haccel = LoadAcceleratorsW(hinstance, MAKEINTRESOURCEW(IDA_WINEFILE));