diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index fa6dfde87..c0a514500 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -2240,9 +2240,9 @@ void Notepad_plus::setDisplayFormat(EolType format) const TCHAR* str = TEXT("??"); switch (format) { - case EolType::windows: str = TEXT("Dos\\Windows"); break; - case EolType::macos: str = TEXT("Macintosh"); break; - case EolType::unix: str = TEXT("UNIX"); break; + case EolType::windows: str = TEXT("Windows (CR LF)"); break; + case EolType::macos: str = TEXT("Macintosh (CR)"); break; + case EolType::unix: str = TEXT("Unix (LF)"); break; case EolType::unknown: str = TEXT("Unknown"); assert(false); break; } _statusBar.setText(str, STATUSBAR_EOF_FORMAT); diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 84ee47cfb..cca699e62 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -322,9 +322,9 @@ BEGIN END POPUP "EOL Conversion" BEGIN - MENUITEM "Windows Format", IDM_FORMAT_TODOS - MENUITEM "UNIX/OSX Format", IDM_FORMAT_TOUNIX - MENUITEM "Old Mac Format", IDM_FORMAT_TOMAC + MENUITEM "Windows (CR LF)", IDM_FORMAT_TODOS + MENUITEM "Unix (LF)", IDM_FORMAT_TOUNIX + MENUITEM "Macintosh (CR)", IDM_FORMAT_TOMAC END POPUP "Blank Operations" BEGIN diff --git a/PowerEditor/src/WinControls/Preference/preference.rc b/PowerEditor/src/WinControls/Preference/preference.rc index 55f40dc01..cce724cd0 100644 --- a/PowerEditor/src/WinControls/Preference/preference.rc +++ b/PowerEditor/src/WinControls/Preference/preference.rc @@ -161,9 +161,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "New Document",IDC_NEWDOCUMENT_GR_STATIC,50,8,354,161,BS_CENTER GROUPBOX "Format (Line ending)",IDC_FORMAT_GB_STATIC,68,29,129,79,BS_CENTER - CONTROL "Windows",IDC_RADIO_F_WIN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,75,48,50,10 - CONTROL "Old Mac",IDC_RADIO_F_MAC,"Button",BS_AUTORADIOBUTTON,75,64,50,10 - CONTROL "Unix/OSX",IDC_RADIO_F_UNIX,"Button",BS_AUTORADIOBUTTON,75,81,50,10 + CONTROL "Windows (CR LF)",IDC_RADIO_F_WIN,"Button",BS_AUTORADIOBUTTON | WS_GROUP,75,48,70,10 + CONTROL "Unix (LF)",IDC_RADIO_F_UNIX,"Button",BS_AUTORADIOBUTTON,75,64,70,10 + CONTROL "Macintosh (CR)",IDC_RADIO_F_MAC,"Button",BS_AUTORADIOBUTTON,75,80,70,10 GROUPBOX "Encoding",IDC_ENCODING_STATIC,212,28,175,122,BS_CENTER CONTROL "ANSI",IDC_RADIO_ANSI,"Button",BS_AUTORADIOBUTTON | WS_GROUP,222,39,80,10 CONTROL "UTF-8",IDC_RADIO_UTF8SANSBOM,"Button",BS_AUTORADIOBUTTON,222,53,128,10