github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/installer/nativeLang/english.xml
View File

@ -5,7 +5,7 @@ Translation note:
2. All the comments are for explanation, they are not for translation.
-->
<NotepadPlus>
<Native-Langue name="English" filename="english.xml" version="8.6.3">
<Native-Langue name="English" filename="english.xml" version="8.6.7">
<Menu>
<Main>
<!-- Main Menu Entries -->

36
PowerEditor/installer/nativeLang/english_customizable.xml
View File

@ -5,7 +5,7 @@ Translation note:
2. All the comments are for explanation, they are not for translation.
-->
<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>
<Main>
<!-- Main Menu Entries -->
@ -120,16 +120,6 @@ Translation note:
<Item id="42007" name="&amp;Select All"/>
<Item id="42020" name="Begin/End &amp;Select"/>
<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="42085" name="Date Time (long)"/>
<Item id="42086" name="Date Time (customized)"/>
@ -166,6 +156,16 @@ Translation note:
<Item id="42074" name="Open Containing Folder in Explorer"/>
<Item id="42075" name="Search on Internet"/>
<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="42019" name="S&amp;top Recording"/>
<Item id="42021" name="&amp;Playback"/>
@ -514,9 +514,9 @@ Translation note:
</Find>
<IncrementalFind title="">
<Item id="1681" name="Find"/>
<Item id="1685" name="Match case"/>
<Item id="1690" name="Highlight all"/>
<Item id="1681" name="Find:"/>
<Item id="1685" name="Match &amp;case"/>
<Item id="1690" name="&amp;Highlight all"/>
</IncrementalFind>
<FindCharsInRange title="Find Characters in Range...">
@ -971,7 +971,7 @@ Translation note:
<Item id="6123" name="Localization"/>
</Global>
<Scintillas title="Editing">
<Scintillas title="Editing 1">
<Item id="6216" name="Caret Settings"/>
<Item id="6217" name="Width:"/>
<Item id="6219" name="Blink rate:"/>
@ -1094,6 +1094,7 @@ Translation note:
<Item id="4009" name="Supported extensions:"/>
<Item id="4010" name="Registered extensions:"/>
</FileAssoc>
<Language title="Language">
<Item id="6505" name="Available items"/>
<Item id="6506" name="Disabled items"/>
@ -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-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-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-hits value="($INT_REPLACE$ hits)"/>
<find-result-line-prefix value="Line"/><!-- Must not begin with space or tab character -->

4
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
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 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 += directory;
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 += fileTypes[0] ? fileTypes : TEXT("*.*");

2
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cpp
View File

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

4
PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp
View File

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

2
PowerEditor/src/winmain.cpp
View File

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