From 12fce004f4a8662434d33203939d142cc075750d Mon Sep 17 00:00:00 2001
From: Liu Hao <lh_mouse@126.com>
Date: Mon, 5 Nov 2018 11:55:35 +0800
Subject: [PATCH 1/2] menu_zh_cn.rc: New translation for 'Selection' and
 'Transpose Lines'.

Signed-off-by: Liu Hao <lh_mouse@126.com>
---
 language/np3_zh_cn/menu_zh_cn.rc | Bin 48360 -> 48332 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index d9e268b226189cfd6f07f3730a7af817fc518bf2..9ab062f9051d1a1931684dd73b9233003e677e11 100644
GIT binary patch
delta 48
zcmaFylj+P)rVT-6ESwXpf+y?6i%rh+5SrX)md3;9$K}W1=hMO5laxGJ!CPdrg87M7
E0KIn*`Tzg`

delta 78
zcmX@}lj+4zrVT-6(!mU=3^_oY%uvFR$&k;G$DqNW#^A!B$)G<u)~sD#jUj}gh#?Uu
bUd&JclrILVRbcP|s?7tkiZ_2ZyV?o>M8y=8


From a33c8979f719e1a8d8e109d82f175eba703d1c37 Mon Sep 17 00:00:00 2001
From: Liu Hao <lh_mouse@126.com>
Date: Mon, 5 Nov 2018 12:10:10 +0800
Subject: [PATCH 2/2] language/common_res.h: Fix default line ending selection
 dialog.

The order of line endings are arranged as { CRLF, CR, LF } in Scintilla.
Our dialog used to display them as { CRLF, LF, CR }, which apparently
mistook CR and LF for the other.

Reference: https://www.scintilla.org/ScintillaDoc.html#SCI_SETEOLMODE
Signed-off-by: Liu Hao <lh_mouse@126.com>
---
 language/common_res.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/language/common_res.h b/language/common_res.h
index c0f062022..5a7fc3dd8 100644
--- a/language/common_res.h
+++ b/language/common_res.h
@@ -635,8 +635,8 @@
 #define IDS_ENC_BIG5_HKSCS              61082
 
 #define IDS_EOL_WIN                     62000
-#define IDS_EOL_UNIX                    62001
-#define IDS_EOL_MAC                     62002
+#define IDS_EOL_MAC                     62001
+#define IDS_EOL_UNIX                    62002
 
 #define IDS_LEX_DEF_TXT                 63000
 #define IDS_LEX_WEB_SRC                 63001