tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-30 17:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Solve the confilt in english.xml

Browse Source
This commit is contained in:
Don Ho 2022-02-08 18:44:59 +01:00
parent 2c1090e554
commit 6392508cd1
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1252,12 +1252,9 @@ Do you want to go to Notepad++ page to download the latest version?"/> <!-- HowT
<DocTooDirtyToMonitor title="Monitoring problem" message="The document is dirty. Please save the modification before monitoring it."/> <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."/> <DocNoExistToMonitor title="Monitoring problem" message="The file should exist to be monitored."/>
<FileTooBigToOpen title="File size problem" message="File is too big to be opened by Notepad++"/> <!-- HowToReproduce: Try to open a 4GB file (it's not easy to reproduce, it depends on your system). --> <FileTooBigToOpen title="File size problem" message="File is too big to be opened by Notepad++"/> <!-- HowToReproduce: Try to open a 4GB file (it's not easy to reproduce, it depends on your system). -->
<<<<<<< HEAD
<FileLoadingException title="Exception code: $STR_REPLACE$" message="An error occurred while loading the file!"/> <FileLoadingException title="Exception code: $STR_REPLACE$" message="An error occurred while loading the file!"/>
=======
<WantToOpenHugeFile title="Opening huge file warning" message="Opening a huge file of 2GB+ could take several minutes. <WantToOpenHugeFile title="Opening huge file warning" message="Opening a huge file of 2GB+ could take several minutes.
Do you want to open it?"/> Do you want to open it?"/>
>>>>>>> 2ad9dee3 (English localization for #11047)
<CreateNewFileOrNot title="Create new file" message="&quot;$STR_REPLACE$&quot; doesn't exist. Create it?"/> <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;."/> <!-- HowToReproduce: this message prevents from system failure. It's hard to reproduce. --> <CreateNewFileError title="Create new file" message="Cannot create the file &quot;$STR_REPLACE$&quot;."/> <!-- HowToReproduce: this message prevents from system failure. It's hard to reproduce. -->
<OpenFileError title="ERROR" message="Can not open file &quot;$STR_REPLACE$&quot;."/> <OpenFileError title="ERROR" message="Can not open file &quot;$STR_REPLACE$&quot;."/>