Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make UI text consistent regarding search results

Browse Source 
Fix #9053, close #9061
This commit is contained in:
Scott Sumner 2020-10-26 16:13:07 -04:00 committed by Don HO
parent 2e39525782
commit f5dcfc196a
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -534,11 +534,11 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="45001" name="EOL Conversion to Windows (CR LF)"/>
<Item id="45002" name="EOL Conversion to Unix (LF)"/>
<Item id="45003" name="EOL Conversion to Macintosh (CR)"/>
<Item id="43022" name="Mark search results using 1st style"/>
<Item id="43024" name="Mark search results using 2nd style"/>
<Item id="43026" name="Mark search results using 3rd style"/>
<Item id="43028" name="Mark search results using 4th style"/>
<Item id="43030" name="Mark search results using 5th style"/>
<Item id="43022" name="Mark text using 1st style"/>
<Item id="43024" name="Mark text using 2nd style"/>
<Item id="43026" name="Mark text using 3rd style"/>
<Item id="43028" name="Mark text using 4th style"/>
<Item id="43030" name="Mark text using 5th style"/>
<Item id="43023" name="Clear marks using 1st style"/>
<Item id="43025" name="Clear marks using 2nd style"/>
<Item id="43027" name="Clear marks using 3rd style"/>
@ -1082,7 +1082,7 @@ You can define several column markers by using white space to separate the diffe
<Item id="1" name="OK"/>
<Item id="2" name="Cancel"/>
</ColumnEditor>
<FindInFinder title="Find in finder">
<FindInFinder title="Find in search results">
<Item id="1" name="Find All"/>
<Item id="2" name="Close"/>
<Item id="1711" name="&amp;Find what :"/>
@ -1336,8 +1336,8 @@ Find in all files except exe, obj &amp;&amp; log:
<find-status-scope-all value="in entire file"/>
<find-status-scope-backward value="from start-of-file to caret"/>
<find-status-scope-forward value="from caret to end-of-file"/>
<finder-find-in-finder value="Find in this found results..."/>
<finder-close-this value="Close this finder"/>
<finder-find-in-finder value="Find in these search results..."/>
<finder-close-this value="Close these search results"/>
<finder-collapse-all value="Collapse all"/>
<finder-uncollapse-all value="Uncollapse all"/>
<finder-copy value="Copy"/>
@ -1373,7 +1373,7 @@ Find in all files except exe, obj &amp;&amp; log:
<replace-in-files-confirm-filetype value="For file type :"/>
<replace-in-open-docs-confirm-title value="Are you sure?"/>
<replace-in-open-docs-confirm-message value="Are you sure you want to replace all occurrences in all open documents?"/>
<find-result-caption value="Find result"/>
<find-result-caption value="Search results"/>
<find-result-title value="Search"/>
<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)"/>

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

@ -519,11 +519,11 @@
<Item id="45001" name="EOL Conversion to Windows (CR LF)"/>
<Item id="45002" name="EOL Conversion to Unix (LF)"/>
<Item id="45003" name="EOL Conversion to Macintosh (CR)"/>
<Item id="43022" name="Mark search results using 1st style"/>
<Item id="43024" name="Mark search results using 2nd style"/>
<Item id="43026" name="Mark search results using 3rd style"/>
<Item id="43028" name="Mark search results using 4th style"/>
<Item id="43030" name="Mark search results using 5th style"/>
<Item id="43022" name="Mark text using 1st style"/>
<Item id="43024" name="Mark text using 2nd style"/>
<Item id="43026" name="Mark text using 3rd style"/>
<Item id="43028" name="Mark text using 4th style"/>
<Item id="43030" name="Mark text using 5th style"/>
<Item id="43023" name="Clear marks using 1st style"/>
<Item id="43025" name="Clear marks using 2nd style"/>
<Item id="43027" name="Clear marks using 3rd style"/>
@ -1057,7 +1057,7 @@ You can define several column markers by using white space to separate the diffe
<Item id="1" name="OK"/>
<Item id="2" name="Cancel"/>
</ColumnEditor>
<FindInFinder title="Find in finder">
<FindInFinder title="Find in search results">
<Item id="1" name="Find All"/>
<Item id="2" name="Close"/>
<Item id="1711" name="&amp;Find what :"/>
@ -1312,8 +1312,8 @@ Find in all files except exe, obj &amp;&amp; log:
<find-status-scope-all value="in entire file"/>
<find-status-scope-backward value="from start-of-file to caret"/>
<find-status-scope-forward value="from caret to end-of-file"/>
<finder-find-in-finder value="Find in this found results..."/>
<finder-close-this value="Close this finder"/>
<finder-find-in-finder value="Find in these search results..."/>
<finder-close-this value="Close these search results"/>
<finder-collapse-all value="Collapse all"/>
<finder-uncollapse-all value="Uncollapse all"/>
<finder-copy value="Copy"/>
@ -1349,7 +1349,7 @@ Find in all files except exe, obj &amp;&amp; log:
<replace-in-files-confirm-filetype value="For file type :"/>
<replace-in-open-docs-confirm-title value="Are you sure?"/>
<replace-in-open-docs-confirm-message value="Are you sure you want to replace all occurrences in all open documents?"/>
<find-result-caption value="Find result"/>
<find-result-caption value="Search results"/>
<find-result-title value="Search"/>
<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)"/>

4
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -3848,8 +3848,8 @@ INT_PTR CALLBACK Finder::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
generic_string findInFinder = pNativeSpeaker->getLocalizedStrFromID("finder-find-in-finder", TEXT("Find in these found results..."));
generic_string closeThis = pNativeSpeaker->getLocalizedStrFromID("finder-close-this", TEXT("Close this finder"));
generic_string findInFinder = pNativeSpeaker->getLocalizedStrFromID("finder-find-in-finder", TEXT("Find in these search results..."));
generic_string closeThis = pNativeSpeaker->getLocalizedStrFromID("finder-close-this", TEXT("Close these search results"));
generic_string collapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-collapse-all", TEXT("Collapse all"));
generic_string uncollapseAll = pNativeSpeaker->getLocalizedStrFromID("finder-uncollapse-all", TEXT("Uncollapse all"));
generic_string copy = pNativeSpeaker->getLocalizedStrFromID("finder-copy", TEXT("Copy"));

4
PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
View File

@ -108,7 +108,7 @@ END
IDD_FINDRESULT DIALOGEX 26, 41, 223, 67
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE
CAPTION "Find result"
CAPTION "Search results"
FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x0
BEGIN
DEFPUSHBUTTON ">",IDC_INCFINDNXTOK,243,0,16,14, NOT WS_VISIBLE
@ -117,7 +117,7 @@ END
IDD_FINDINFINDER_DLG DIALOGEX 36, 44, 367, 200
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW
CAPTION "Find in found results"
CAPTION "Find in search results"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
RTEXT "&Find what :",IDFINDWHAT_STATIC_FIFOLDER,6,22,75,8