From f6282f4f11f88b1ead93ea3e5a044236d082de67 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Tue, 14 Sep 2021 23:33:34 +0200 Subject: [PATCH] Update localization files And fix a typo in BUILD.md --- BUILD.md | 4 ++-- PowerEditor/installer/nativeLang/english.xml | 2 +- PowerEditor/installer/nativeLang/french.xml | 3 ++- PowerEditor/installer/nativeLang/taiwaneseMandarin.xml | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/BUILD.md b/BUILD.md index 9771026c6..8bbb4dcd2 100644 --- a/BUILD.md +++ b/BUILD.md @@ -44,11 +44,11 @@ uses features from Boost's `Boost.Regex` library. If you have [MinGW-w64](https://www.mingw-w64.org/) installed, you can compile Notepad++ with GCC. -MinGW-w64 can be downloaded from [SourceForge](https://sourceforge.net/projects/mingw-w64/files/). Building Notepad++ is regularly tested on a Windows system with [x86_64-8.1.0-release-posix-seh-rt_v6-rev0](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z) and with [i686-8.1.0-release-posix-dwarf-rt_v6-rev0](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-posix/dwarf/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z) versions of MinGW-w64 GCC. Other versions may also work but are untested. +MinGW-w64 can be downloaded [here](https://sourceforge.net/projects/mingw-w64/files/). Building Notepad++ is regularly tested on a Windows system with [x86_64-8.1.0-release-posix-seh-rt_v6-rev0](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z) for building 64-bits binary and with [i686-8.1.0-release-posix-dwarf-rt_v6-rev0](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/8.1.0/threads-posix/dwarf/i686-8.1.0-release-posix-dwarf-rt_v6-rev0.7z) versions for building 32-bits binary. Other versions may also work but are untested. **Note:** If you use MinGW-w64 GCC from a package (7z), you need to manually add the `$MinGW-root$\bin` directory to the system `PATH` environment variable for the `mingw32-make` invocation below to work. One can use a command like `set PATH=$MinGW-root$\bin;%PATH%` each time `cmd` is launched. But beware that if `PATH` contains several versions of MinGW-w64 GCC, only the first one will be usable. -## Comping Notepad++ binary +## Compiling Notepad++ binary 1. Launch `cmd` and add `$MinGW-root$\bin` to `PATH` if necessary. 2. `cd` into `notepad-plus-plus\PowerEditor\gcc`. diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml index e5a05a0ab..c3e19aeaa 100644 --- a/PowerEditor/installer/nativeLang/english.xml +++ b/PowerEditor/installer/nativeLang/english.xml @@ -3,7 +3,7 @@ The comments are here for explanation, it's not necessary to translate them. --> - +
diff --git a/PowerEditor/installer/nativeLang/french.xml b/PowerEditor/installer/nativeLang/french.xml index 4b5a95c0c..04aba5534 100644 --- a/PowerEditor/installer/nativeLang/french.xml +++ b/PowerEditor/installer/nativeLang/french.xml @@ -1,6 +1,6 @@ - +
@@ -1250,6 +1250,7 @@ Voulez-vous les poursuivez ?"/> + diff --git a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml index 33a892d51..ca0cb2947 100644 --- a/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml +++ b/PowerEditor/installer/nativeLang/taiwaneseMandarin.xml @@ -1,6 +1,6 @@ - +
@@ -1249,6 +1249,7 @@ +