Make english language text with colon (':') consistent

Fix #4628, close #15165
pull/15169/head
ozone10 2024-05-21 08:07:49 +02:00 committed by Don Ho
parent ef840de150
commit 912c5ee300
7 changed files with 47 additions and 41 deletions

View File

@ -5,7 +5,7 @@ Translation note:
2. All the comments are for explanation, they are not for translation. 2. All the comments are for explanation, they are not for translation.
--> -->
<NotepadPlus> <NotepadPlus>
<Native-Langue name="English" filename="english.xml" version="8.6.3"> <Native-Langue name="English" filename="english.xml" version="8.6.7">
<Menu> <Menu>
<Main> <Main>
<!-- Main Menu Entries --> <!-- Main Menu Entries -->
@ -468,7 +468,7 @@ Translation note:
<Item id="1" name="Find Next"/> <Item id="1" name="Find Next"/>
<Item id="1722" name="Backward direction"/> <Item id="1722" name="Backward direction"/>
<Item id="2" name="Close"/> <Item id="2" name="Close"/>
<Item id="1620" name="&amp;Find what :"/> <Item id="1620" name="&amp;Find what:"/>
<Item id="1603" name="Match &amp;whole word only"/> <Item id="1603" name="Match &amp;whole word only"/>
<Item id="1604" name="Match &amp;case"/> <Item id="1604" name="Match &amp;case"/>
<Item id="1605" name="Re&amp;gular expression"/> <Item id="1605" name="Re&amp;gular expression"/>
@ -477,7 +477,7 @@ Translation note:
<Item id="1615" name="Mark All"/> <Item id="1615" name="Mark All"/>
<Item id="1616" name="Book&amp;mark line"/> <Item id="1616" name="Book&amp;mark line"/>
<Item id="1618" name="Purge for each search"/> <Item id="1618" name="Purge for each search"/>
<Item id="1611" name="Rep&amp;lace with :"/> <Item id="1611" name="Rep&amp;lace with:"/>
<Item id="1608" name="&amp;Replace"/> <Item id="1608" name="&amp;Replace"/>
<Item id="1609" name="Replace &amp;All"/> <Item id="1609" name="Replace &amp;All"/>
<Item id="1687" name="On losing focus"/> <Item id="1687" name="On losing focus"/>
@ -486,8 +486,8 @@ Translation note:
<Item id="1633" name="Clear all marks"/> <Item id="1633" name="Clear all marks"/>
<Item id="1635" name="Replace All in All &amp;Opened Documents"/> <Item id="1635" name="Replace All in All &amp;Opened Documents"/>
<Item id="1636" name="Find All in All &amp;Opened Documents"/> <Item id="1636" name="Find All in All &amp;Opened Documents"/>
<Item id="1654" name="Filter&amp;s :"/> <Item id="1654" name="Filter&amp;s:"/>
<Item id="1655" name="Dir&amp;ectory :"/> <Item id="1655" name="Dir&amp;ectory:"/>
<Item id="1656" name="Find All"/> <Item id="1656" name="Find All"/>
<Item id="1658" name="In all su&amp;b-folders"/> <Item id="1658" name="In all su&amp;b-folders"/>
<Item id="1659" name="In &amp;hidden folders"/> <Item id="1659" name="In &amp;hidden folders"/>
@ -1076,7 +1076,7 @@ Translation note:
<Item id="6408" name="UTF-8 with BOM"/> <Item id="6408" name="UTF-8 with BOM"/>
<Item id="6409" name="UTF-16 Big Endian with BOM"/> <Item id="6409" name="UTF-16 Big Endian with BOM"/>
<Item id="6410" name="UTF-16 Little Endian with BOM"/> <Item id="6410" name="UTF-16 Little Endian with BOM"/>
<Item id="6411" name="Default language :"/> <Item id="6411" name="Default language:"/>
<Item id="6419" name="New Document"/> <Item id="6419" name="New Document"/>
<Item id="6420" name="Apply to opened ANSI files"/> <Item id="6420" name="Apply to opened ANSI files"/>
<Item id="6432" name="Always open a new document in addition at startup"/> <Item id="6432" name="Always open a new document in addition at startup"/>
@ -1199,7 +1199,7 @@ Translation note:
<Item id="6316" name="Simple backup"/> <Item id="6316" name="Simple backup"/>
<Item id="6317" name="Verbose backup"/> <Item id="6317" name="Verbose backup"/>
<Item id="6804" name="Custom Backup Directory"/> <Item id="6804" name="Custom Backup Directory"/>
<Item id="6803" name="Directory :"/> <Item id="6803" name="Directory:"/>
</Backup> </Backup>
<AutoCompletion title="Auto-Completion"> <AutoCompletion title="Auto-Completion">
@ -1720,8 +1720,8 @@ Find in all files but exclude all folders log or logs recursively:
<progress-cancel-info value="Cancelling operation, please wait..."/> <progress-cancel-info value="Cancelling operation, please wait..."/>
<find-in-files-progress-title value="Find In Files progress..."/> <find-in-files-progress-title value="Find In Files progress..."/>
<replace-in-files-confirm-title value="Are you sure?"/> <replace-in-files-confirm-title value="Are you sure?"/>
<replace-in-files-confirm-directory value="Are you sure you want to replace all occurrences in :"/> <replace-in-files-confirm-directory value="Are you sure you want to replace all occurrences in:"/>
<replace-in-files-confirm-filetype value="For file type :"/> <replace-in-files-confirm-filetype value="For file type:"/>
<replace-in-files-progress-title value="Replace In Files progress..."/> <replace-in-files-progress-title value="Replace In Files progress..."/>
<replace-in-projects-confirm-title value="Are you sure?"/> <replace-in-projects-confirm-title value="Are you sure?"/>
<replace-in-projects-confirm-message value="Do you want to replace all occurrences in all documents in the selected Project Panel(s)?"/> <replace-in-projects-confirm-message value="Do you want to replace all occurrences in all documents in the selected Project Panel(s)?"/>

View File

@ -5,7 +5,7 @@ Translation note:
2. All the comments are for explanation, they are not for translation. 2. All the comments are for explanation, they are not for translation.
--> -->
<NotepadPlus> <NotepadPlus>
<Native-Langue name="English" filename="english_customizable.xml" version="8.6.3"> <Native-Langue name="English" filename="english_customizable.xml" version="8.6.7">
<Menu> <Menu>
<Main> <Main>
<!-- Main Menu Entries --> <!-- Main Menu Entries -->
@ -120,16 +120,6 @@ Translation note:
<Item id="42007" name="&amp;Select All"/> <Item id="42007" name="&amp;Select All"/>
<Item id="42020" name="Begin/End &amp;Select"/> <Item id="42020" name="Begin/End &amp;Select"/>
<Item id="42089" name="Begin/End Select in Column Mode"/> <Item id="42089" name="Begin/End Select in Column Mode"/>
<Item id="42090" name="Ignore Case &amp;&amp; Whole Word"/>
<Item id="42091" name="Match Case Only"/>
<Item id="42092" name="Match Whole Word Only"/>
<Item id="42093" name="Match Case &amp;&amp; Whole Word"/>
<Item id="42094" name="Ignore Case &amp;&amp; Whole Word"/>
<Item id="42095" name="Match Case Only"/>
<Item id="42096" name="Match Whole Word Only"/>
<Item id="42097" name="Match Case &amp;&amp; Whole Word"/>
<Item id="42098" name="Undo the Latest Added Multi-Select"/>
<Item id="42099" name="Skip Current &amp;&amp; Go to Next Multi-select"/>
<Item id="42084" name="Date Time (short)"/> <Item id="42084" name="Date Time (short)"/>
<Item id="42085" name="Date Time (long)"/> <Item id="42085" name="Date Time (long)"/>
<Item id="42086" name="Date Time (customized)"/> <Item id="42086" name="Date Time (customized)"/>
@ -166,6 +156,16 @@ Translation note:
<Item id="42074" name="Open Containing Folder in Explorer"/> <Item id="42074" name="Open Containing Folder in Explorer"/>
<Item id="42075" name="Search on Internet"/> <Item id="42075" name="Search on Internet"/>
<Item id="42076" name="Change Search Engine..."/> <Item id="42076" name="Change Search Engine..."/>
<Item id="42090" name="Ignore Case &amp;&amp; Whole Word"/>
<Item id="42091" name="Match Case Only"/>
<Item id="42092" name="Match Whole Word Only"/>
<Item id="42093" name="Match Case &amp;&amp; Whole Word"/>
<Item id="42094" name="Ignore Case &amp;&amp; Whole Word"/>
<Item id="42095" name="Match Case Only"/>
<Item id="42096" name="Match Whole Word Only"/>
<Item id="42097" name="Match Case &amp;&amp; Whole Word"/>
<Item id="42098" name="Undo the Latest Added Multi-Select"/>
<Item id="42099" name="Skip Current &amp;&amp; Go to Next Multi-select"/>
<Item id="42018" name="Start Re&amp;cording"/> <Item id="42018" name="Start Re&amp;cording"/>
<Item id="42019" name="S&amp;top Recording"/> <Item id="42019" name="S&amp;top Recording"/>
<Item id="42021" name="&amp;Playback"/> <Item id="42021" name="&amp;Playback"/>
@ -468,7 +468,7 @@ Translation note:
<Item id="1" name="Find Next"/> <Item id="1" name="Find Next"/>
<Item id="1722" name="Backward direction"/> <Item id="1722" name="Backward direction"/>
<Item id="2" name="Close"/> <Item id="2" name="Close"/>
<Item id="1620" name="&amp;Find what :"/> <Item id="1620" name="&amp;Find what:"/>
<Item id="1603" name="Match &amp;whole word only"/> <Item id="1603" name="Match &amp;whole word only"/>
<Item id="1604" name="Match &amp;case"/> <Item id="1604" name="Match &amp;case"/>
<Item id="1605" name="Re&amp;gular expression"/> <Item id="1605" name="Re&amp;gular expression"/>
@ -477,7 +477,7 @@ Translation note:
<Item id="1615" name="Mark All"/> <Item id="1615" name="Mark All"/>
<Item id="1616" name="Book&amp;mark line"/> <Item id="1616" name="Book&amp;mark line"/>
<Item id="1618" name="Purge for each search"/> <Item id="1618" name="Purge for each search"/>
<Item id="1611" name="Rep&amp;lace with :"/> <Item id="1611" name="Rep&amp;lace with:"/>
<Item id="1608" name="&amp;Replace"/> <Item id="1608" name="&amp;Replace"/>
<Item id="1609" name="Replace &amp;All"/> <Item id="1609" name="Replace &amp;All"/>
<Item id="1687" name="On losing focus"/> <Item id="1687" name="On losing focus"/>
@ -486,8 +486,8 @@ Translation note:
<Item id="1633" name="Clear all marks"/> <Item id="1633" name="Clear all marks"/>
<Item id="1635" name="Replace All in All &amp;Opened Documents"/> <Item id="1635" name="Replace All in All &amp;Opened Documents"/>
<Item id="1636" name="Find All in All &amp;Opened Documents"/> <Item id="1636" name="Find All in All &amp;Opened Documents"/>
<Item id="1654" name="Filter&amp;s :"/> <Item id="1654" name="Filter&amp;s:"/>
<Item id="1655" name="Dir&amp;ectory :"/> <Item id="1655" name="Dir&amp;ectory:"/>
<Item id="1656" name="Find All"/> <Item id="1656" name="Find All"/>
<Item id="1658" name="In all su&amp;b-folders"/> <Item id="1658" name="In all su&amp;b-folders"/>
<Item id="1659" name="In &amp;hidden folders"/> <Item id="1659" name="In &amp;hidden folders"/>
@ -514,9 +514,9 @@ Translation note:
</Find> </Find>
<IncrementalFind title=""> <IncrementalFind title="">
<Item id="1681" name="Find"/> <Item id="1681" name="Find:"/>
<Item id="1685" name="Match case"/> <Item id="1685" name="Match &amp;case"/>
<Item id="1690" name="Highlight all"/> <Item id="1690" name="&amp;Highlight all"/>
</IncrementalFind> </IncrementalFind>
<FindCharsInRange title="Find Characters in Range..."> <FindCharsInRange title="Find Characters in Range...">
@ -971,7 +971,7 @@ Translation note:
<Item id="6123" name="Localization"/> <Item id="6123" name="Localization"/>
</Global> </Global>
<Scintillas title="Editing"> <Scintillas title="Editing 1">
<Item id="6216" name="Caret Settings"/> <Item id="6216" name="Caret Settings"/>
<Item id="6217" name="Width:"/> <Item id="6217" name="Width:"/>
<Item id="6219" name="Blink rate:"/> <Item id="6219" name="Blink rate:"/>
@ -1076,7 +1076,7 @@ Translation note:
<Item id="6408" name="UTF-8 with BOM"/> <Item id="6408" name="UTF-8 with BOM"/>
<Item id="6409" name="UTF-16 Big Endian with BOM"/> <Item id="6409" name="UTF-16 Big Endian with BOM"/>
<Item id="6410" name="UTF-16 Little Endian with BOM"/> <Item id="6410" name="UTF-16 Little Endian with BOM"/>
<Item id="6411" name="Default language :"/> <Item id="6411" name="Default language:"/>
<Item id="6419" name="New Document"/> <Item id="6419" name="New Document"/>
<Item id="6420" name="Apply to opened ANSI files"/> <Item id="6420" name="Apply to opened ANSI files"/>
<Item id="6432" name="Always open a new document in addition at startup"/> <Item id="6432" name="Always open a new document in addition at startup"/>
@ -1094,6 +1094,7 @@ Translation note:
<Item id="4009" name="Supported extensions:"/> <Item id="4009" name="Supported extensions:"/>
<Item id="4010" name="Registered extensions:"/> <Item id="4010" name="Registered extensions:"/>
</FileAssoc> </FileAssoc>
<Language title="Language"> <Language title="Language">
<Item id="6505" name="Available items"/> <Item id="6505" name="Available items"/>
<Item id="6506" name="Disabled items"/> <Item id="6506" name="Disabled items"/>
@ -1198,7 +1199,7 @@ Translation note:
<Item id="6316" name="Simple backup"/> <Item id="6316" name="Simple backup"/>
<Item id="6317" name="Verbose backup"/> <Item id="6317" name="Verbose backup"/>
<Item id="6804" name="Custom Backup Directory"/> <Item id="6804" name="Custom Backup Directory"/>
<Item id="6803" name="Directory :"/> <Item id="6803" name="Directory:"/>
</Backup> </Backup>
<AutoCompletion title="Auto-Completion"> <AutoCompletion title="Auto-Completion">
@ -1719,8 +1720,8 @@ Find in all files but exclude all folders log or logs recursively:
<progress-cancel-info value="Cancelling operation, please wait..."/> <progress-cancel-info value="Cancelling operation, please wait..."/>
<find-in-files-progress-title value="Find In Files progress..."/> <find-in-files-progress-title value="Find In Files progress..."/>
<replace-in-files-confirm-title value="Are you sure?"/> <replace-in-files-confirm-title value="Are you sure?"/>
<replace-in-files-confirm-directory value="Are you sure you want to replace all occurrences in :"/> <replace-in-files-confirm-directory value="Are you sure you want to replace all occurrences in:"/>
<replace-in-files-confirm-filetype value="For file type :"/> <replace-in-files-confirm-filetype value="For file type:"/>
<replace-in-files-progress-title value="Replace In Files progress..."/> <replace-in-files-progress-title value="Replace In Files progress..."/>
<replace-in-projects-confirm-title value="Are you sure?"/> <replace-in-projects-confirm-title value="Are you sure?"/>
<replace-in-projects-confirm-message value="Do you want to replace all occurrences in all documents in the selected Project Panel(s)?"/> <replace-in-projects-confirm-message value="Do you want to replace all occurrences in all documents in the selected Project Panel(s)?"/>
@ -1730,6 +1731,11 @@ Find in all files but exclude all folders log or logs recursively:
<find-result-title value="Search"/><!-- Must not begin with space or tab character --> <find-result-title value="Search"/><!-- Must not begin with space or tab character -->
<find-result-title-info value="($INT_REPLACE1$ hits in $INT_REPLACE2$ files of $INT_REPLACE3$ searched)"/> <find-result-title-info value="($INT_REPLACE1$ hits in $INT_REPLACE2$ files of $INT_REPLACE3$ searched)"/>
<find-result-title-info-selections value="($INT_REPLACE1$ hits in $INT_REPLACE2$ selections of $INT_REPLACE3$ searched)"/> <find-result-title-info-selections value="($INT_REPLACE1$ hits in $INT_REPLACE2$ selections of $INT_REPLACE3$ searched)"/>
<find-result-title-info-options-searchmode-normal value="Normal"/>
<find-result-title-info-options-searchmode-extended value="Extended"/>
<find-result-title-info-options-searchmode-regexp value="RegEx"/>
<find-result-title-info-options-case value="Case"/>
<find-result-title-info-options-word value="Word"/>
<find-result-title-info-extra value=" - Line Filter Mode: only display the filtered results"/> <find-result-title-info-extra value=" - Line Filter Mode: only display the filtered results"/>
<find-result-hits value="($INT_REPLACE$ hits)"/> <find-result-hits value="($INT_REPLACE$ hits)"/>
<find-result-line-prefix value="Line"/><!-- Must not begin with space or tab character --> <find-result-line-prefix value="Line"/><!-- Must not begin with space or tab character -->

View File

@ -4974,13 +4974,13 @@ bool FindReplaceDlg::replaceInFilesConfirmCheck(generic_string directory, generi
generic_string title = pNativeSpeaker->getLocalizedStrFromID("replace-in-files-confirm-title", TEXT("Are you sure?")); generic_string title = pNativeSpeaker->getLocalizedStrFromID("replace-in-files-confirm-title", TEXT("Are you sure?"));
generic_string msg = pNativeSpeaker->getLocalizedStrFromID("replace-in-files-confirm-directory", TEXT("Are you sure you want to replace all occurrences in :")); generic_string msg = pNativeSpeaker->getLocalizedStrFromID("replace-in-files-confirm-directory", L"Are you sure you want to replace all occurrences in:");
msg += TEXT("\r\r"); msg += TEXT("\r\r");
msg += directory; msg += directory;
msg += TEXT("\r\r"); msg += TEXT("\r\r");
generic_string msg2 = pNativeSpeaker->getLocalizedStrFromID("replace-in-files-confirm-filetype", TEXT("For file type :")); generic_string msg2 = pNativeSpeaker->getLocalizedStrFromID("replace-in-files-confirm-filetype", L"For file type:");
msg2 += TEXT("\r\r"); msg2 += TEXT("\r\r");
msg2 += fileTypes[0] ? fileTypes : TEXT("*.*"); msg2 += fileTypes[0] ? fileTypes : TEXT("*.*");

View File

@ -1069,7 +1069,7 @@ void WordStyleDlg::setVisualFromStyleList()
if (static_cast<size_t>(lbTextLen) > styleNameLen) if (static_cast<size_t>(lbTextLen) > styleNameLen)
return; return;
::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXT, i, reinterpret_cast<LPARAM>(styleName)); ::SendDlgItemMessage(_hSelf, IDC_STYLES_LIST, LB_GETTEXT, i, reinterpret_cast<LPARAM>(styleName));
wcscat_s(str, TEXT(" : ")); wcscat_s(str, L": ");
wcscat_s(str, styleName); wcscat_s(str, styleName);
// PAD for fix a display glitch // PAD for fix a display glitch

View File

@ -228,7 +228,7 @@ BEGIN
CONTROL "UTF-16 Little Endian with BOM",IDC_RADIO_UTF16SMALL,"Button",BS_AUTORADIOBUTTON,242,111,110,10 CONTROL "UTF-16 Little Endian with BOM",IDC_RADIO_UTF16SMALL,"Button",BS_AUTORADIOBUTTON,242,111,110,10
CONTROL "",IDC_RADIO_OTHERCP,"Button",BS_AUTORADIOBUTTON,242,126,10,10 CONTROL "",IDC_RADIO_OTHERCP,"Button",BS_AUTORADIOBUTTON,242,126,10,10
COMBOBOX IDC_COMBO_OTHERCP,257,125,100,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_OTHERCP,257,125,100,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
RTEXT "Default language :",IDC_DEFAULTLANG_STATIC,16,125,77,8 RTEXT "Default language:",IDC_DEFAULTLANG_STATIC,16,125,77,8
COMBOBOX IDC_COMBO_DEFAULTLANG,98,123,100,140,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_DEFAULTLANG,98,123,100,140,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
CONTROL "Always open a new document in addition at startup",IDC_CHECK_ADDNEWDOCONSTARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,152,250,10 CONTROL "Always open a new document in addition at startup",IDC_CHECK_ADDNEWDOCONSTARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,152,250,10
END END
@ -479,7 +479,7 @@ BEGIN
CONTROL "Reverse default date time order (short && long formats)",IDD_DATETIMEFORMAT_REVERSEORDER_CHECK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | BS_TOP | WS_TABSTOP,17,93,256,20 CONTROL "Reverse default date time order (short && long formats)",IDD_DATETIMEFORMAT_REVERSEORDER_CHECK,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | BS_TOP | WS_TABSTOP,17,93,256,20
RTEXT "yyyy-MM-dd HH:mm:ss\nH:m d/M/yyyy\nMMM d, yyyy tt h:m",IDC_STATIC,36,118,77,25 RTEXT "yyyy-MM-dd HH:mm:ss\nH:m d/M/yyyy\nMMM d, yyyy tt h:m",IDC_STATIC,36,118,77,25
LTEXT "1985-10-26 16:24:42\n16:24 26/10/1985\nOct 26, 1985 PM 4:24",IDC_STATIC,136,118,94,25 LTEXT "1985-10-26 16:24:42\n16:24 26/10/1985\nOct 26, 1985 PM 4:24",IDC_STATIC,136,118,94,25
RTEXT "Custom format :",IDD_DATETIMEFORMAT_STATIC,14,148,77,8 RTEXT "Custom format:",IDD_DATETIMEFORMAT_STATIC,14,148,77,8
EDITTEXT IDC_DATETIMEFORMAT_EDIT,92,146,175,12,ES_AUTOHSCROLL EDITTEXT IDC_DATETIMEFORMAT_EDIT,92,146,175,12,ES_AUTOHSCROLL
LTEXT "",IDD_DATETIMEFORMAT_RESULT_STATIC,94,163,180,8 LTEXT "",IDD_DATETIMEFORMAT_RESULT_STATIC,94,163,180,8

View File

@ -393,11 +393,11 @@ intptr_t CALLBACK RunDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam
return TRUE; return TRUE;
} }
case IDC_BUTTON_FILE_BROWSER : case IDC_BUTTON_FILE_BROWSER:
{ {
CustomFileDialog fd(_hSelf); CustomFileDialog fd(_hSelf);
fd.setExtFilter(TEXT("Executable file : "), { TEXT(".exe"), TEXT(".com"), TEXT(".cmd"), TEXT(".bat") }); fd.setExtFilter(L"Executable File", { L".exe", L".com", L".cmd", L".bat" });
fd.setExtFilter(TEXT("All files : "), TEXT(".*")); fd.setExtFilter(L"All Files", L".*");
generic_string fn = fd.doOpenSingleFileDlg(); generic_string fn = fd.doOpenSingleFileDlg();
if (!fn.empty()) if (!fn.empty())

View File

@ -730,7 +730,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE /*hPrevInstance
} }
catch (int i) catch (int i)
{ {
TCHAR str[50] = TEXT("God Damned Exception : "); wchar_t str[50] = L"God Damned Exception:";
TCHAR code[10]; TCHAR code[10];
wsprintf(code, TEXT("%d"), i); wsprintf(code, TEXT("%d"), i);
wcscat_s(str, code); wcscat_s(str, code);