CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2722 from RaiKoHoff/Dev_NewFeatures

Browse Source 
Rearrange and review "File Encoding" menu to clarify behavior
This commit is contained in:
Pairi Daiza 2020-08-27 00:30:07 +02:00 committed by GitHub
commit 05b02f9ba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 57 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
language/np3_de_de/dialogs_de_de.rc
View File

@ -654,7 +654,7 @@ END
IDD_MUI_RECODE DIALOGEX 0, 0, 185, 135
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Recodierung"
CAPTION "Erneut Laden als"
FONT 9, "Segoe UI", 400, 0, 0x1
BEGIN
LTEXT "Wähle Quell-Codierung um die Datei erneut zu laden:",IDC_STATIC,7,7,160,8
@ -666,10 +666,10 @@ END
IDD_MUI_ENCODING DIALOGEX 0, 0, 185, 135
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Codierung"
CAPTION "Setze Codierung"
FONT 9, "Segoe UI", 400, 0, 0x1
BEGIN
LTEXT "Wähle &Codierung für geladene Datei:",IDC_STATIC,7,7,160,8
LTEXT "Wähle &Codierung für das aktuelle Dokument:",IDC_STATIC,7,7,160,8
CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,171,87
DEFPUSHBUTTON "OK",IDOK,73,114,50,14,WS_DISABLED
PUSHBUTTON "Abbrechen",IDCANCEL,128,114,50,14

43
language/np3_de_de/menu_de_de.rc
View File

@ -59,7 +59,6 @@ BEGIN
BEGIN
MENUITEM "&Neu\tCtrl+N", IDM_FILE_NEW
MENUITEM "&Öffnen...\tCtrl+O", IDM_FILE_OPEN
MENUITEM "&Erneut laden\tF5", IDM_FILE_REVERT
MENUITEM "&Speichern\tCtrl+S", IDM_FILE_SAVE
MENUITEM "Speichern &unter...\tF6", IDM_FILE_SAVEAS
MENUITEM "&Kopie speichern...\tCtrl+F6", IDM_FILE_SAVECOPY
@ -94,26 +93,34 @@ BEGIN
MENUITEM "Öffne Datei-&Explorer", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
MENUITEM "&Datei erneut laden\tF5", IDM_FILE_REVERT
POPUP "&Codierung"
BEGIN
MENUITEM "&ANSI", IDM_ENCODING_ANSI
MENUITEM "&Unicode", IDM_ENCODING_UNICODE
MENUITEM "Unicode &Big Endian", IDM_ENCODING_UNICODEREV
MENUITEM "UTF-&8\tShift+F8", IDM_ENCODING_UTF8
MENUITEM "UTF-8 mit &Signatur", IDM_ENCODING_UTF8SIGN
MENUITEM "&Mehr Codierungen...\tF9", IDM_ENCODING_SELECT
POPUP "&Datei erneut laden als"
BEGIN
MENUITEM "&Default (Voreinstellung)", CMD_RECODEDEFAULT
MENUITEM "&ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "&OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "&GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030
MENUITEM SEPARATOR
MENUITEM "ASCII als UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
MENUITEM "Erzwinge UCHARDET Analyse", CMD_RELOADFORCEDETECTION
MENUITEM "Ignoriere Codierungs &Tags\tAlt+F8", CMD_RELOADNOFILEVARS
MENUITEM SEPARATOR
MENUITEM "Mehr &Codierungen...\tF8", IDM_ENCODING_RECODE
END
POPUP "&Setze Dokument als"
BEGIN
MENUITEM "&ANSI", IDM_ENCODING_ANSI
MENUITEM "&Unicode", IDM_ENCODING_UNICODE
MENUITEM "Unicode &Big Endian", IDM_ENCODING_UNICODEREV
MENUITEM "UTF-&8\tShift+F8", IDM_ENCODING_UTF8
MENUITEM "UTF-8 mit &Signatur", IDM_ENCODING_UTF8SIGN
MENUITEM SEPARATOR
MENUITEM "Mehr &Codierungen...\tF9", IDM_ENCODING_SELECT
END
MENUITEM SEPARATOR
MENUITEM "Recodiere als &Default", CMD_RECODEDEFAULT
MENUITEM "Recodiere als &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Recodiere als &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Recodiere als &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030
MENUITEM "Recodiere wie UCHARDET Analyse", CMD_RELOADFORCEDETECTION
MENUITEM SEPARATOR
MENUITEM "ASCII als UTF-&8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
MENUITEM "Ignoriere Codierungs &Tags\tAlt+F8", CMD_RELOADNOFILEVARS
MENUITEM "&Re-Codierung...\tF8", IDM_ENCODING_RECODE
MENUITEM SEPARATOR
MENUITEM "&Voreinstellung...", IDM_ENCODING_SETDEFAULT
MENUITEM "Codierungs &Voreinstellung...", IDM_ENCODING_SETDEFAULT
END
POPUP "Zeilenumbruch"
BEGIN

6
language/np3_en_us/dialogs_en_us.rc
View File

@ -654,7 +654,7 @@ END
IDD_MUI_RECODE DIALOGEX 0, 0, 165, 135
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Recode"
CAPTION "Revert as"
FONT 9, "Segoe UI", 400, 0, 0x1
BEGIN
LTEXT "Select source &encoding to reload file:",IDC_STATIC,7,7,119,8
@ -666,10 +666,10 @@ END
IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Encoding"
CAPTION "Set Encoding"
FONT 9, "Segoe UI", 400, 0, 0x1
BEGIN
LTEXT "Select current file &encoding:",IDC_STATIC,7,7,90,8
LTEXT "Select current document &encoding:",IDC_STATIC,7,7,90,8
CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87
DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED
PUSHBUTTON "Cancel",IDCANCEL,108,114,50,14

45
language/np3_en_us/menu_en_us.rc
View File

@ -59,7 +59,6 @@ BEGIN
BEGIN
MENUITEM "&New\tCtrl+N", IDM_FILE_NEW
MENUITEM "&Open...\tCtrl+O", IDM_FILE_OPEN
MENUITEM "Re&vert\tF5", IDM_FILE_REVERT
MENUITEM "&Save\tCtrl+S", IDM_FILE_SAVE
MENUITEM "Save &As...\tF6", IDM_FILE_SAVEAS
MENUITEM "Save &Copy...\tCtrl+F6", IDM_FILE_SAVECOPY
@ -77,7 +76,7 @@ BEGIN
END
POPUP "&Launch"
BEGIN
MENUITEM "&Search in Files\tCtrl+Shift+F", IDM_GREP_WIN_SEARCH
MENUITEM "&Search in Files\tCtrl+Shift+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&New Window\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Empty Window\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -94,26 +93,34 @@ BEGIN
MENUITEM "Open &File Explorer", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
MENUITEM "Re&vert from File\tF5", IDM_FILE_REVERT
POPUP "&Encoding"
BEGIN
MENUITEM "&ANSI", IDM_ENCODING_ANSI
MENUITEM "&Unicode", IDM_ENCODING_UNICODE
MENUITEM "Unicode &Big Endian", IDM_ENCODING_UNICODEREV
MENUITEM "UTF-&8\tShift+F8", IDM_ENCODING_UTF8
MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN
MENUITEM "&More...\tF9", IDM_ENCODING_SELECT
POPUP "&Revert from File as"
BEGIN
MENUITEM "&Default (Setting)", CMD_RECODEDEFAULT
MENUITEM "A&NSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "&OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "&GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030
MENUITEM SEPARATOR
MENUITEM "ASCII as UT&F-8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
MENUITEM "Force U&CHARDET Analysis", CMD_RELOADFORCEDETECTION
MENUITEM "&Ignore Encoding Tags\tAlt+F8", CMD_RELOADNOFILEVARS
MENUITEM SEPARATOR
MENUITEM "&More Encodings...\tF8", IDM_ENCODING_RECODE
END
POPUP "&Set Document as"
BEGIN
MENUITEM "&ANSI", IDM_ENCODING_ANSI
MENUITEM "&Unicode", IDM_ENCODING_UNICODE
MENUITEM "Unicode &Big Endian", IDM_ENCODING_UNICODEREV
MENUITEM "UTF-&8\tShift+F8", IDM_ENCODING_UTF8
MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN
MENUITEM SEPARATOR
MENUITEM "&More Encodings...\tF9", IDM_ENCODING_SELECT
END
MENUITEM SEPARATOR
MENUITEM "Recode to &Default", CMD_RECODEDEFAULT
MENUITEM "Recode to A&NSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Recode to &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030
MENUITEM "Recode to U&CHARDET Analysis", CMD_RELOADFORCEDETECTION
MENUITEM SEPARATOR
MENUITEM "ASCII as UT&F-8\tCtrl+Shift+F8", CMD_RELOADASCIIASUTF8
MENUITEM "&Ignore Encoding Tags\tAlt+F8", CMD_RELOADNOFILEVARS
MENUITEM "&Recode...\tF8", IDM_ENCODING_RECODE
MENUITEM SEPARATOR
MENUITEM "Se&t Default...", IDM_ENCODING_SETDEFAULT
MENUITEM "Set Encoding &Defaults...", IDM_ENCODING_SETDEFAULT
END
POPUP "Line Endin&gs"
BEGIN