Merge branch 'Dev_Fix4Releases' into Dev_NewFeatures

This commit is contained in:
Rainer Kottenhoff 2018-12-20 06:14:09 +01:00
commit b17cd5634e
2 changed files with 10 additions and 10 deletions

View File

@ -177,7 +177,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
CAPTION "Kodering"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
GROUPBOX "Standaard Kodering (nuwe lêer):",IDC_STATIC,7,7,183,48,0,WS_EX_TRANSPARENT
GROUPBOX "Standaard Kodering (nuwe lêer):",IDC_STATIC,7,7,183,48,0,WS_EX_TRANSPARENT
CONTROL "",IDC_ENCODINGLIST,"ComboBoxEx32",CBS_DROPDOWNLIST | WS_CLIPSIBLINGS | WS_VSCROLL | WS_TABSTOP,14,19,167,128
CONTROL "Gebruik as en terug&val op opsporing mislukking.",IDC_USEASREADINGFALLBACK,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,38,155,10
@ -230,13 +230,13 @@ END
IDD_MUI_FILEMRU DIALOGEX 0, 0, 269, 160
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Maak Onlangse Lêer Oop"
CAPTION "Maak Onlangse Lêer Oop"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "",IDC_FILEMRU,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,255,97
CONTROL "&Onthou soekpatroon.",IDC_REMEMBERSEARCHPATTERN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,130,96,10
CONTROL "&Behou caret &posisie.",IDC_PRESERVECARET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,96,10
CONTROL "&Stoor onlangse lêerlys by uitgang.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,96,10
CONTROL "&Stoor onlangse lêerlys by uitgang.",IDC_SAVEMRU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,107,96,10
PUSHBUTTON "Gooi weg",IDC_REMOVE,212,107,50,14,WS_DISABLED
DEFPUSHBUTTON "OK",IDOK,154,139,50,14,WS_DISABLED
PUSHBUTTON "Kanselleer",IDCANCEL,212,139,50,14
@ -245,13 +245,13 @@ END
IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Lêererveranderingkennisgewing"
CAPTION "Lêererveranderingkennisgewing"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
CONTROL "&Geen.",100,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,7,35,10
CONTROL "&Wys boodskap.",101,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,19,71,10
CONTROL "&Herlaai outomaties (ongewysig).",102,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,7,31,99,10
CONTROL "&Stel terug as 'n nuwe lêer oopgemaak word.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
CONTROL "&Stel terug as 'n nuwe lêer oopgemaak word.",103,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,48,109,10
DEFPUSHBUTTON "OK",IDOK,127,7,50,14
PUSHBUTTON "Kanselleer",IDCANCEL,127,24,50,14
END

View File

@ -54,7 +54,7 @@ END
IDR_MUI_MAINMENU MENU
BEGIN
POPUP "&Lêer"
POPUP "&Lêer"
BEGIN
MENUITEM "&Nuwe\tCtrl+N", IDM_FILE_NEW
MENUITEM "Maak &Oop...\tCtrl+O", IDM_FILE_OPEN
@ -69,7 +69,7 @@ BEGIN
POPUP "&Begin"
BEGIN
MENUITEM "&Nuwe Venster\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "L&eë Venster\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
MENUITEM "L&eë Venster\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
MENUITEM SEPARATOR
MENUITEM "Voer &Dokument Uit\tCtrl+L", IDM_FILE_LAUNCH
MENUITEM "Maak &Oop Met...\tAlt+L", IDM_FILE_OPENWITH
@ -118,7 +118,7 @@ BEGIN
POPUP "&Gunstelinge"
BEGIN
MENUITEM "Maak Gunstelinge &Oop...\tAlt+I", IDM_FILE_OPENFAV
MENUITEM "&Voeg Huidige Lêer By...\tAlt+K", IDM_FILE_ADDTOFAV
MENUITEM "&Voeg Huidige Lêer By...\tAlt+K", IDM_FILE_ADDTOFAV
MENUITEM "&Bestuur...\tAlt+F9", IDM_FILE_MANAGEFAV
END
MENUITEM "Onlangse (&Geskiedenis)...\tCtrl+Alt+H", IDM_FILE_RECENT
@ -169,9 +169,9 @@ BEGIN
MENUITEM "Smel&t Lyne Saam\tCtrl+Alt+J", IDM_EDIT_JOINLN_NOSP
MENUITEM "Behou &Paragrawe\tCtrl+Shift+J", IDM_EDIT_JOINLINES_PARA
MENUITEM SEPARATOR
MENUITEM "Voeg Leë Lyne &Saam\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES
MENUITEM "Voeg Leë Lyne &Saam\tAlt+Y", IDM_EDIT_MERGEEMPTYLINES
MENUITEM "Voeg &Blank Lyne Saam\tCtrl+Alt+Y", IDM_EDIT_MERGEBLANKLINES
MENUITEM "Verw&yder Leë Lyne\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES
MENUITEM "Verw&yder Leë Lyne\tAlt+R", IDM_EDIT_REMOVEEMPTYLINES
MENUITEM "Ver&wyder Blank Lyne\tCtrl+Alt+B", IDM_EDIT_REMOVEBLANKLINES
MENUITEM "Verwyder D&uplikaatlyne\tCtrl+Alt+D", IDM_EDIT_REMOVEDUPLICATELINES
END