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
Browse Source

Improve description for settings "Backup" 

Fix #14560, close #15351
pull/15413/head^2
Don Ho 5 months ago
parent
0858dfa4af
commit
108b9f0d24
7 changed files with 28 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      PowerEditor/installer/nativeLang/english.xml
  2. 17
      PowerEditor/installer/nativeLang/english_customizable.xml
  3. 2
      PowerEditor/src/Notepad_plus.cpp
  4. 2
      PowerEditor/src/Notepad_plus.rc
  5. 8
      PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
  6. 6
      PowerEditor/src/WinControls/Preference/preference.rc
  7. 2
      PowerEditor/src/WinControls/Preference/preferenceDlg.cpp

17
PowerEditor/installer/nativeLang/english.xml
Unescape View File

@ -222,7 +222,7 @@ Translation note:
<Item id="43051" name="Remove Non-Bookmarked Lines"/>
<Item id="43050" name="Inverse Bookmark"/>
<Item id="43052" name="Find characters in rang&amp;e..."/>
<Item id="43053" name="Select All Between &amp;Matching Braces"/>
<Item id="43053" name="Select All In-betw&amp;een {} [] or ()"/>
<Item id="43009" name="Go to &amp;Matching Brace"/>
<Item id="43010" name="Find &amp;Previous"/>
<Item id="43011" name="&amp;Incremental Search"/>
@ -355,6 +355,7 @@ Translation note:
<Item id="10005" name="Move to Start"/>
<Item id="10006" name="Move to End"/>
<Item id="46001" name="Style Configurator..."/>
<Item id="46016" name="None (Normal Text)"/>
<Item id="46250" name="Define your language..."/>
<Item id="46300" name="Open User Defined Language folder..."/>
<Item id="46301" name="Notepad++ User Defined Languages Collection"/>
@ -1200,7 +1201,7 @@ Translation note:
<Backup title="Backup">
<Item id="6817" name="Session snapshot and periodic backup"/>
<Item id="6818" name="Enable session snapshot and periodic backup"/>
<Item id="6819" name="Backup in every"/>
<Item id="6819" name="Trigger backup on modifification in every"/>
<Item id="6821" name="seconds"/>
<Item id="6822" name="Backup path:"/>
<Item id="6309" name="Remember current session for next launch"/>
@ -1306,7 +1307,7 @@ Translation note:
<MISC title="MISC.">
<ComboBox id="6347">
<Element name="Enable"/>
<Element name="Enable for current file"/>
<Element name="Enable for all opened files"/>
<Element name="Disable"/>
</ComboBox>
@ -1424,7 +1425,7 @@ Your settings on cloud will be canceled. Please reset a coherent value via Prefe
<FilePathNotFoundWarning title="File Open" message="The file you're trying to open doesn't exist."/><!-- HowToReproduce: this message prevents from system failure. It's hard to reproduce. -->
<SessionFileInvalidError title="Could not Load Session" message="Session file is either corrupted or not valid."/><!-- HowToReproduce: Save current session via menu "File -> Save Session...", use another editor to modify the session you saved to make it an invalid xml file. Then load this invalid session via menu "File -> Load Session...". -->
<DroppingFolderAsProjectModeWarning title="Invalid action" message="You can only drop files or folders but not both, because you're in dropping Folder as Project mode.
you have to enable &quot;Open all files of folder instead of launching Folder as Workspace on folder dropping&quot; in &quot;Default Directory&quot; section of Preferences dialog to make this operation work."/>
You have to enable &quot;Open all files of folder instead of launching Folder as Workspace on folder dropping&quot; in &quot;Default Directory&quot; section of Preferences dialog to make this operation work."/>
<SortingError title="Sorting Error" message="Unable to perform numeric sorting due to line $INT_REPLACE$."/><!-- HowToReproduce: this message prevents from system failure. It's hard to reproduce. -->
<ColumnModeTip title="Column Mode Tip" message="
There are 3 ways to switch to column-select mode:
@ -1672,8 +1673,8 @@ Find in all files but exclude folders tests, bin &amp;&amp; bin64:
Find in all files but exclude all folders log or logs recursively:
*.* !+\log*"/><!-- HowToReproduce: Tip of mouse hovered on "Filters" label in "Find in Files" section of Find dialog. -->
<find-in-files-select-folder value="Select a folder to search from"/><!-- HowToReproduce: Search > Find in Files > [...] -->
<find-status-top-reached value="Find: Found the 1st occurrence from the bottom. The beginning of the document has been reached."/>
<find-status-end-reached value="Find: Found the 1st occurrence from the top. The end of the document has been reached."/>
<find-status-top-reached value="Find: Found the last occurrence from the bottom. The beginning of the document has been reached."/>
<find-status-end-reached value="Find: Found the last occurrence from the top. The end of the document has been reached."/>
<find-status-replaceinfiles-1-replaced value="Replace in Files: 1 occurrence was replaced"/>
<find-status-replaceinfiles-nb-replaced value="Replace in Files: $INT_REPLACE$ occurrences were replaced"/>
<find-status-replaceinopenedfiles-1-replaced value="Replace in Opened Files: 1 occurrence was replaced"/>
@ -1687,8 +1688,8 @@ Find in all files but exclude all folders log or logs recursively:
<find-status-replaceall-1-replaced value="Replace All: 1 occurrence was replaced"/>
<find-status-replaceall-nb-replaced value="Replace All: $INT_REPLACE$ occurrences were replaced"/>
<find-status-replaceall-readonly value="Replace All: Cannot replace text. The current document is read only"/>
<find-status-replace-end-reached value="Replace: Replaced the 1st occurrence from the top. The end of document has been reached"/>
<find-status-replace-top-reached value="Replace: Replaced the 1st occurrence from the bottom. The begin of document has been reached"/>
<find-status-replace-end-reached value="Replace: Replaced the last occurrence from the top. The end of document has been reached"/>
<find-status-replace-top-reached value="Replace: Replaced the last occurrence from the bottom. The begin of document has been reached"/>
<find-status-replaced-next-found value="Replace: 1 occurrence was replaced. The next occurrence found."/>
<find-status-replaced-without-continuing value="Replace: 1 occurrence was replaced."/>
<find-status-replaced-next-not-found value="Replace: 1 occurrence was replaced. No more occurrences were found."/>

17
PowerEditor/installer/nativeLang/english_customizable.xml
Unescape View File

@ -222,7 +222,7 @@ Translation note:
<Item id="43051" name="Remove Non-Bookmarked Lines"/>
<Item id="43050" name="Inverse Bookmark"/>
<Item id="43052" name="Find characters in rang&amp;e..."/>
<Item id="43053" name="Select All Between &amp;Matching Braces"/>
<Item id="43053" name="Select All In-betw&amp;een {} [] or ()"/>
<Item id="43009" name="Go to &amp;Matching Brace"/>
<Item id="43010" name="Find &amp;Previous"/>
<Item id="43011" name="&amp;Incremental Search"/>
@ -355,6 +355,7 @@ Translation note:
<Item id="10005" name="Move to Start"/>
<Item id="10006" name="Move to End"/>
<Item id="46001" name="Style Configurator..."/>
<Item id="46016" name="None (NormalText)"/>
<Item id="46250" name="Define your language..."/>
<Item id="46300" name="Open User Defined Language folder..."/>
<Item id="46301" name="Notepad++ User Defined Languages Collection"/>
@ -1199,7 +1200,7 @@ Translation note:
<Backup title="Backup">
<Item id="6817" name="Session snapshot and periodic backup"/>
<Item id="6818" name="Enable session snapshot and periodic backup"/>
<Item id="6819" name="Backup in every"/>
<Item id="6819" name="Trigger backup on modifification in every"/>
<Item id="6821" name="seconds"/>
<Item id="6822" name="Backup path:"/>
<Item id="6309" name="Remember current session for next launch"/>
@ -1305,7 +1306,7 @@ Translation note:
<MISC title="MISC.">
<ComboBox id="6347">
<Element name="Enable"/>
<Element name="Enable for current file"/>
<Element name="Enable for all opened files"/>
<Element name="Disable"/>
</ComboBox>
@ -1423,7 +1424,7 @@ Your settings on cloud will be canceled. Please reset a coherent value via Prefe
<FilePathNotFoundWarning title="File Open" message="The file you're trying to open doesn't exist."/><!-- HowToReproduce: this message prevents from system failure. It's hard to reproduce. -->
<SessionFileInvalidError title="Could not Load Session" message="Session file is either corrupted or not valid."/><!-- HowToReproduce: Save current session via menu "File -> Save Session...", use another editor to modify the session you saved to make it an invalid xml file. Then load this invalid session via menu "File -> Load Session...". -->
<DroppingFolderAsProjectModeWarning title="Invalid action" message="You can only drop files or folders but not both, because you're in dropping Folder as Project mode.
you have to enable &quot;Open all files of folder instead of launching Folder as Workspace on folder dropping&quot; in &quot;Default Directory&quot; section of Preferences dialog to make this operation work."/>
You have to enable &quot;Open all files of folder instead of launching Folder as Workspace on folder dropping&quot; in &quot;Default Directory&quot; section of Preferences dialog to make this operation work."/>
<SortingError title="Sorting Error" message="Unable to perform numeric sorting due to line $INT_REPLACE$."/><!-- HowToReproduce: this message prevents from system failure. It's hard to reproduce. -->
<ColumnModeTip title="Column Mode Tip" message="
There are 3 ways to switch to column-select mode:
@ -1671,8 +1672,8 @@ Find in all files but exclude folders tests, bin &amp;&amp; bin64:
Find in all files but exclude all folders log or logs recursively:
*.* !+\log*"/><!-- HowToReproduce: Tip of mouse hovered on "Filters" label in "Find in Files" section of Find dialog. -->
<find-in-files-select-folder value="Select a folder to search from"/><!-- HowToReproduce: Search > Find in Files > [...] -->
<find-status-top-reached value="Find: Found the 1st occurrence from the bottom. The beginning of the document has been reached."/>
<find-status-end-reached value="Find: Found the 1st occurrence from the top. The end of the document has been reached."/>
<find-status-top-reached value="Find: Found the last occurrence from the bottom. The beginning of the document has been reached."/>
<find-status-end-reached value="Find: Found the last occurrence from the top. The end of the document has been reached."/>
<find-status-replaceinfiles-1-replaced value="Replace in Files: 1 occurrence was replaced"/>
<find-status-replaceinfiles-nb-replaced value="Replace in Files: $INT_REPLACE$ occurrences were replaced"/>
<find-status-replaceinopenedfiles-1-replaced value="Replace in Opened Files: 1 occurrence was replaced"/>
@ -1686,8 +1687,8 @@ Find in all files but exclude all folders log or logs recursively:
<find-status-replaceall-1-replaced value="Replace All: 1 occurrence was replaced"/>
<find-status-replaceall-nb-replaced value="Replace All: $INT_REPLACE$ occurrences were replaced"/>
<find-status-replaceall-readonly value="Replace All: Cannot replace text. The current document is read only"/>
<find-status-replace-end-reached value="Replace: Replaced the 1st occurrence from the top. The end of document has been reached"/>
<find-status-replace-top-reached value="Replace: Replaced the 1st occurrence from the bottom. The begin of document has been reached"/>
<find-status-replace-end-reached value="Replace: Replaced the last occurrence from the top. The end of document has been reached"/>
<find-status-replace-top-reached value="Replace: Replaced the last occurrence from the bottom. The begin of document has been reached"/>
<find-status-replaced-next-found value="Replace: 1 occurrence was replaced. The next occurrence found."/>
<find-status-replaced-without-continuing value="Replace: 1 occurrence was replaced."/>
<find-status-replaced-next-not-found value="Replace: 1 occurrence was replaced. No more occurrences were found."/>

2
PowerEditor/src/Notepad_plus.cpp
Unescape View File

@ -4467,7 +4467,7 @@ void Notepad_plus::dropFiles(HDROP hdrop)
// display error & do nothing
_nativeLangSpeaker.messageBox("DroppingFolderAsProjectModeWarning",
_pPublicInterface->getHSelf(),
L"You can only drop files or folders but not both, because you're in dropping Folder as Project mode.\ryou have to enable \"Open all files of folder instead of launching Folder as Workspace on folder dropping\" in \"Default Directory\" section of Preferences dialog to make this operation work.",
L"You can only drop files or folders but not both, because you're in dropping Folder as Project mode.\rYou have to enable \"Open all files of folder instead of launching Folder as Workspace on folder dropping\" in \"Default Directory\" section of Preferences dialog to make this operation work.",
L"Invalid action",
MB_OK | MB_APPLMODAL);
}

2
PowerEditor/src/Notepad_plus.rc
Unescape View File

@ -600,7 +600,7 @@ BEGIN
MENUITEM "Previous Search Resul&t", IDM_SEARCH_GOTOPREVFOUND
MENUITEM "&Go to...", IDM_SEARCH_GOTOLINE
MENUITEM "Go to &Matching Brace", IDM_SEARCH_GOTOMATCHINGBRACE
MENUITEM "Select All Between &Matching Braces", IDM_SEARCH_SELECTMATCHINGBRACES
MENUITEM "Select All In-betw&een {} [] or ()", IDM_SEARCH_SELECTMATCHINGBRACES
MENUITEM "Mar&k...", IDM_SEARCH_MARK
MENUITEM SEPARATOR
POPUP "Change History"

8
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
Unescape View File

@ -1905,12 +1905,12 @@ intptr_t CALLBACK FindReplaceDlg::run_dlgProc(UINT message, WPARAM wParam, LPARA
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
if (findStatus == FSEndReached)
{
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-end-reached", L"Find: Found the 1st occurrence from the top. The end of the document has been reached.");
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-end-reached", L"Find: Found the last occurrence from the top. The end of the document has been reached.");
setStatusbarMessage(msg, FSEndReached);
}
else if (findStatus == FSTopReached)
{
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-top-reached", L"Find: Found the 1st occurrence from the bottom. The beginning of the document has been reached.");
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-top-reached", L"Find: Found the last occurrence from the bottom. The beginning of the document has been reached.");
setStatusbarMessage(msg, FSTopReached);
}
}
@ -2966,12 +2966,12 @@ bool FindReplaceDlg::processReplace(const wchar_t *txt2find, const wchar_t *txt2
if (status == FSEndReached)
{
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-replace-end-reached", L"Replace: Replaced the 1st occurrence from the top. The end of document has been reached.");
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-replace-end-reached", L"Replace: Replaced the last occurrence from the top. The end of document has been reached.");
setStatusbarMessage(msg, FSEndReached);
}
else if (status == FSTopReached)
{
wstring msg = pNativeSpeaker->getLocalizedStrFromID("find-status-replace-top-reached", L"Replace: Replaced the 1st occurrence from the bottom. The begin of document has been reached.");
generic_string msg = pNativeSpeaker->getLocalizedStrFromID("find-status-replace-top-reached", L"Replace: Replaced the last occurrence from the bottom. The begin of document has been reached.");
setStatusbarMessage(msg, FSTopReached);
}
else

6
PowerEditor/src/WinControls/Preference/preference.rc
Unescape View File

@ -409,9 +409,9 @@ BEGIN
GROUPBOX "Session snapshot and periodic backup",IDC_BACKUPDIR_RESTORESESSION_GRP_STATIC,79,1,289,98,BS_CENTER
CONTROL "Remember current session for next launch",IDC_CHECK_REMEMBERSESSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,85,14,270,10
CONTROL "Enable session snapshot and periodic backup",IDC_BACKUPDIR_RESTORESESSION_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,85,29,270,10
RTEXT "Backup in every",IDD_BACKUPDIR_RESTORESESSION_STATIC1,82,46,78,8
EDITTEXT IDC_BACKUPDIR_RESTORESESSION_EDIT,164,44,21,12,ES_CENTER | ES_NUMBER
LTEXT "seconds",IDD_BACKUPDIR_RESTORESESSION_STATIC2,190,46,66,8
RTEXT "Trigger backup on modifification in every",IDD_BACKUPDIR_RESTORESESSION_STATIC1,82,46,190,8
EDITTEXT IDC_BACKUPDIR_RESTORESESSION_EDIT,276,44,21,12,ES_CENTER | ES_NUMBER
LTEXT "seconds",IDD_BACKUPDIR_RESTORESESSION_STATIC2,302,46,66,8
RTEXT "Backup path:",IDD_BACKUPDIR_RESTORESESSION_PATHLABEL_STATIC,85,64,61,8
EDITTEXT IDD_BACKUPDIR_RESTORESESSION_PATH_EDIT,153,62,208,12,ES_AUTOHSCROLL | ES_READONLY
CONTROL "Remember inaccessible files from past session",IDC_CHECK_KEEPABSENTFILESINSESSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,85,83,270,10

2
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
Unescape View File

@ -2385,7 +2385,7 @@ intptr_t CALLBACK MiscSubDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM)
{
case WM_INITDIALOG :
{
::SendDlgItemMessage(_hSelf, IDC_COMBO_FILEUPDATECHOICE, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Enable"));
::SendDlgItemMessage(_hSelf, IDC_COMBO_FILEUPDATECHOICE, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Enable for current file"));
::SendDlgItemMessage(_hSelf, IDC_COMBO_FILEUPDATECHOICE, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Enable for all opened files"));
::SendDlgItemMessage(_hSelf, IDC_COMBO_FILEUPDATECHOICE, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Disable"));

Write Preview
Loading…
Cancel
Save