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

Fix the wrong integer replacement (instead of string) 

Fix also some minor grammatical errors

Close #4203
This commit is contained in:
Don HO 2018-02-20 13:38:09 +01:00
parent 803917dd09
commit a1b4628b8b
6 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -958,9 +958,9 @@ or on a folder needed privilege right for writing access.
Your settings on cloud will be canceled. Please reset a coherent value via Preference dialog."/>
<FilePathNotFoundWarning title="File Open" message="The file you're trying to open doesn't exist."/>
<SessionFileInvalidError title="Could not Load Session" message="Session file is either corrupted or not valid."/>
<DroppingFolderAsProjetModeWarning title="Invalid action" message="You can drop only files or folders but not both, because you're in dropping Folder as Project mode.
<DroppingFolderAsProjetModeWarning 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."/>
<SortingError title="Sorting Error" message="Unable to perform numeric sort due to line $INT_REPLACE$."/>
<SortingError title="Sorting Error" message="Unable to perform numeric sorting due to line $INT_REPLACE$."/>
<ColumnModeTip title="Column Mode Tip" message="Please use &quot;ALT+Mouse Selection&quot; or &quot;Alt+Shift+Arrow key&quot; to switch to column mode."/>
<BufferInvalidWarning title="Save failed" message="Cannot save: Buffer is invalid."/>
<DoSaveOrNot title="Save" message="Save file &quot;$STR_REPLACE$&quot; ?"/>
@ -980,19 +980,19 @@ Do you want to reload it?"/>
This file has been modified by another program.
Do you want to reload it and lose the changes made in Notepad++?"/>
<PrehistoricSystemDetected title="Prehistoric system detected" message="It seems you still use a prehistoric system, This feature works only on a modern system, sorry."/>
<PrehistoricSystemDetected title="Prehistoric system detected" message="It seems you still use a prehistoric system. This feature works only on a modern system, sorry."/>
<XpUpdaterProblem title="Notepad++ Updater" message="Notepad++ updater is not compatible with XP due to the obsolete security layer under XP.
Do you want to go to Notepad++ page to download the latest version?"/>
<DocTooDirtyToMonitor title="Monitoring problem" message="The document is dirty. Please save the modification before monitoring it."/>
<DocNoExistToMonitor title="Monitoring problem" message="The file should exist to be monitored."/>
<FileTooBigToOpene title="File size problem" message="File is too big to be opened by Notepad++"/>
<CreateNewFileOrNot title="Create new file" message="&quot;$INT_REPLACE$&quot; doesn't exist. Create it?."/>
<CreateNewFileError title="Create new file" message="Cannot create the file &quot;$INT_REPLACE$&quot;."/>
<OpenFileError title="ERROR" message="Can not open file &quot;$INT_REPLACE$&quot;."/>
<FileBackupFailed title="File Backup Failed" message="The previous version of the file could not be saved into the backup directory at &quot;$INT_REPLACE$&quot;.
<CreateNewFileOrNot title="Create new file" message="&quot;$STR_REPLACE$&quot; doesn't exist. Create it?."/>
<CreateNewFileError title="Create new file" message="Cannot create the file &quot;$STR_REPLACE$&quot;."/>
<OpenFileError title="ERROR" message="Can not open file &quot;$STR_REPLACE$&quot;."/>
<FileBackupFailed title="File Backup Failed" message="The previous version of the file could not be saved into the backup directory at &quot;$STR_REPLACE$&quot;.
Do you want to save the current file anyways?"/>
<LoadStylersFailed title="Load stylers.xml failed" message="Load &quot;$INT_REPLACE$&quot; failed!"/>
<LoadStylersFailed title="Load stylers.xml failed" message="Load &quot;$STR_REPLACE$&quot; failed!"/>
<LoadLangsFailed title="Configurator" message="Load langs.xml failed!
Do you want to recover your langs.xml?"/>
<LoadLangsFailedFinal title="Configurator" message="Load langs.xml failed!"/>
@ -1015,7 +1015,7 @@ Do you want to continue?"/>
please give another one."/>
<UDLRemoveCurrentLang title="Remove the current language" message="Are you sure?"/>
<SCMapperDoDeleteOrNot title="Are you sure?" message="Are you sure you want to delete this shortcut?"/>
<FindCharRangeValueError title="Range Value problem" message="You should type between from 0 to 255."/>
<FindCharRangeValueError title="Range Value problem" message="You should type between 0 and 255."/>
</MessageBox>
<ClipboardHistory>
<PanelTitle name="Clipboard History"/>
@ -1138,7 +1138,6 @@ please give another one."/>
<find-status-replace-not-found value="Replace: no occurrence was found"/>
<find-status-replace-readonly value="Replace: Cannot replace text. The current document is read only"/>
<find-status-cannot-find value="Find: Can't find the text &quot;$STR_REPLACE$&quot;"/>
<find-status-mark-nb-matches value="$INT_REPLACE$ matches"/>
</MiscStrings>
</Native-Langue>
</NotepadPlus>

4
PowerEditor/src/Notepad_plus.cpp
View File

@ -3270,7 +3270,7 @@ void Notepad_plus::dropFiles(HDROP hdrop)
// display error & do nothing
_nativeLangSpeaker.messageBox("DroppingFolderAsProjetModeWarning",
_pPublicInterface->getHSelf(),
TEXT("You can drop only 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."),
TEXT("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."),
TEXT("Invalid action"),
MB_OK | MB_APPLMODAL);
}
@ -5909,7 +5909,7 @@ void Notepad_plus::launchDocMap()
{
_nativeLangSpeaker.messageBox("PrehistoricSystemDetected",
_pPublicInterface->getHSelf(),
TEXT("It seems you still use a prehistoric system, This feature works only on a modern system, sorry."),
TEXT("It seems you still use a prehistoric system. This feature works only on a modern system, sorry."),
TEXT("Prehistoric system detected"),
MB_OK);

2
PowerEditor/src/NppCommands.cpp
View File

@ -632,7 +632,7 @@ void Notepad_plus::command(int id)
_nativeLangSpeaker.messageBox("SortingError",
_pPublicInterface->getHSelf(),
TEXT("Unable to perform numeric sort due to line $INT_REPLACE$."),
TEXT("Unable to perform numeric sorting due to line $INT_REPLACE$."),
TEXT("Sorting Error"),
MB_OK | MB_ICONINFORMATION | MB_APPLMODAL,
static_cast<int>(lineNo),

8
PowerEditor/src/NppIO.cpp
View File

@ -224,7 +224,7 @@ BufferID Notepad_plus::doOpen(const generic_string& fileName, bool isRecursive,
{
int res = _nativeLangSpeaker.messageBox("CreateNewFileOrNot",
_pPublicInterface->getHSelf(),
TEXT("\"$INT_REPLACE$\" doesn't exist. Create it?."),
TEXT("\"$STR_REPLACE$\" doesn't exist. Create it?."),
TEXT("Create new file"),
MB_YESNO,
0,
@ -241,7 +241,7 @@ BufferID Notepad_plus::doOpen(const generic_string& fileName, bool isRecursive,
{
_nativeLangSpeaker.messageBox("CreateNewFileError",
_pPublicInterface->getHSelf(),
TEXT("Cannot create the file \"$INT_REPLACE$\"."),
TEXT("Cannot create the file \"$STR_REPLACE$\"."),
TEXT("Create new file"),
MB_OK,
0,
@ -396,7 +396,7 @@ BufferID Notepad_plus::doOpen(const generic_string& fileName, bool isRecursive,
{
_nativeLangSpeaker.messageBox("OpenFileError",
_pPublicInterface->getHSelf(),
TEXT("Can not open file \"$INT_REPLACE$\"."),
TEXT("Can not open file \"$STRT_REPLACE$\"."),
TEXT("ERROR"),
MB_OK,
0,
@ -1268,7 +1268,7 @@ bool Notepad_plus::fileSave(BufferID id)
{
int res = _nativeLangSpeaker.messageBox("FileBackupFailed",
_pPublicInterface->getHSelf(),
TEXT("The previous version of the file could not be saved into the backup directory at \"$INT_REPLACE$\".\r\rDo you want to save the current file anyways?"),
TEXT("The previous version of the file could not be saved into the backup directory at \"$STR_REPLACE$\".\r\rDo you want to save the current file anyways?"),
TEXT("File Backup Failed"),
MB_YESNO | MB_ICONERROR,
0,

4
PowerEditor/src/Parameters.cpp
View File

@ -892,7 +892,7 @@ bool NppParameters::reloadStylers(TCHAR* stylePath)
{
_pNativeLangSpeaker->messageBox("LoadStylersFailed",
NULL,
TEXT("Load \"$INT_REPLACE$\" failed!"),
TEXT("Load \"$STR_REPLACE$\" failed!"),
TEXT("Load stylers.xml failed"),
MB_OK,
0,
@ -1165,7 +1165,7 @@ bool NppParameters::load()
{
_pNativeLangSpeaker->messageBox("LoadStylersFailed",
NULL,
TEXT("Load \"$INT_REPLACE$\" failed!"),
TEXT("Load \"$STR_REPLACE$\" failed!"),
TEXT("Load stylers.xml failed"),
MB_OK,
0,

2
PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.cpp
View File

@ -64,7 +64,7 @@ INT_PTR CALLBACK FindCharsInRangeDlg::run_dlgProc(UINT message, WPARAM wParam, L
//STOP!
NppParameters::getInstance()->getNativeLangSpeaker()->messageBox("FindCharRangeValueError",
_hSelf,
TEXT("You should type between from 0 to 255."),
TEXT("You should type between 0 and 255."),
TEXT("Range Value problem"),
MB_OK);
return TRUE;