CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,313 Commits 2 Branches 34 Tags 274 MiB
0db0d237cc
Commit Graph

310 Commits

Author SHA1 Message Date
Rainer Kottenhoff
0db0d237cc Merge branch 'Dev_RC2_UTF8' into Dev_AccelKeys 
# Conflicts:
#	ced/ced/compact_enc_det/compact_enc_det.cc
#	ced/targetver.h
#	language/common_res.h
#	language/common_res.rc
#	language/np3_af_za/dialogs_af_za.rc
#	language/np3_af_za/strings_af_za.rc
#	language/np3_be_by/dialogs_be_by.rc
#	language/np3_be_by/strings_be_by.rc
#	language/np3_de_de/dialogs_de_de.rc
#	language/np3_de_de/strings_de_de.rc
#	language/np3_en_gb/dialogs_en_gb.rc
#	language/np3_en_gb/strings_en_gb.rc
#	language/np3_en_us/dialogs_en_us.rc
#	language/np3_en_us/np3_en_us.rc
#	language/np3_en_us/strings_en_us.rc
#	language/np3_es_es/dialogs_es_es.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/dialogs_fr_fr.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/dialogs_ja_jp.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_nl_nl/dialogs_nl_nl.rc
#	language/np3_nl_nl/strings_nl_nl.rc
#	language/np3_ru_ru/dialogs_ru_ru.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/dialogs_zh_cn.rc
#	language/np3_zh_cn/menu_zh_cn.rc
#	language/np3_zh_cn/resource.h
#	language/np3_zh_cn/strings_zh_cn.rc
#	minipath/src/minipath.rc
#	np3encrypt/targetver.h
#	src/Dialogs.h
 2018-11-15 15:58:09 +01:00
Rainer Kottenhoff
5f7020695d + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 15:40:16 +01:00
Rainer Kottenhoff
637bd98f19 + chg: UTF-8 encoding based resource files (*.rc), UTF-8-Sig. based source code files (.c .h .cpp) 2018-11-15 11:44:41 +01:00
Pairi Daiza
1ba9dd9a43 + MUI: RTF "About" Titles in ja-JP - correction (maboroshin translation) 2018-11-13 16:08:18 +01:00
Rainer Kottenhoff
012d5cdad4 + chg: Command Line Help: using sizeable dialog box instead of auto-sized MessageBox 2018-11-13 12:03:15 +01:00
Rainer Kottenhoff
cac3b71b30 Merge branch 'Dev_Fixes4Release' into Dev_AccelKeys 
# Conflicts:
#	language/common_res.rc
#	language/np3_af_za/dialogs_af_za.rc
#	language/np3_be_by/dialogs_be_by.rc
#	language/np3_be_by/strings_be_by.rc
#	language/np3_de_de/dialogs_de_de.rc
#	language/np3_de_de/strings_de_de.rc
#	language/np3_en_gb/dialogs_en_gb.rc
#	language/np3_en_us/dialogs_en_us.rc
#	language/np3_es_es/dialogs_es_es.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/dialogs_fr_fr.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/dialogs_ja_jp.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_nl_nl/dialogs_nl_nl.rc
#	language/np3_nl_nl/strings_nl_nl.rc
#	language/np3_ru_ru/dialogs_ru_ru.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/dialogs_zh_cn.rc
#	language/np3_zh_cn/strings_zh_cn.rc
 2018-11-13 08:43:07 +01:00
Pairi Daiza
47c9a22d86 + MUI: "About Text Frame" - Adjust Height of Rich Text Control 
- Request of "lhmouse" to you use full-width colons |：| instead of half-width colons |:| for Chinese characters
 2018-11-13 00:35:37 +01:00
Pairi Daiza
5804af5389 + MUI: "About Text Frame" - Adjust Height of Rich Text Control 2018-11-13 00:22:19 +01:00
Alex Yashkin
3d598a7119 ru-RU: missed tab symbol in IDS_MUI_CMDLINEHELP 2018-11-11 22:44:31 +03:00
Alex Yashkin
576401bfd4 Merge branch 'master' of github.com:rizonesoft/Notepad3 into np3_be_ru 2018-11-11 19:18:12 +03:00
Alex Yashkin
9d9d542a5e be-BY & ru-RU: translated MiniPath, some fixes 2018-11-11 19:17:39 +03:00
Pairi Daiza
f973d1b282 + MUI: RTF "About" strings in zh-CN - correction titles (source: lhmouse) 2018-11-11 16:59:03 +01:00
Alex Yashkin
6871171fbb be-BY & ru-RU: resized dialogs, fixed russian translation 2018-11-11 15:56:33 +03:00
Alex Yashkin
8320565abf Complete be-BY translation 2018-11-11 15:21:38 +03:00
Pairi Daiza
aa3e9209e6 + MUI: RTF "About" strings - Use same Syntax as ja-JP and zn-CN 2018-11-11 10:26:46 +01:00
Pairi Daiza
453dadb3bf + Revert to "Arial" instead of "Arial Unicode MS" 2018-11-11 01:10:37 +01:00
Pairi Daiza
697cd7ca0d + RTF translation of some titles of the "About" window in "ja-JP" and "zh-CN" 2018-11-10 19:52:51 +01:00
Pairi Daiza
01ce4b63c1 + Translation in About the item: "Development" in fr-FR, nl-NL and es-ES 
- Highlight in bold "Florian 'Flo' Balmer"
- Add a missing string in "strings_de_de.rc"
 2018-11-09 19:44:25 +01:00
Rainer Kottenhoff
812cdf0793 Merge branch 'Dev_Fixes4Release' into Dev_AccelKeys 
# Conflicts:
#	language/common_res.rc
#	language/np3_af_za/strings_af_za.rc
#	language/np3_be_by/strings_be_by.rc
#	language/np3_de_de/strings_de_de.rc
#	language/np3_en_gb/strings_en_gb.rc
#	language/np3_en_us/strings_en_us.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_nl_nl/strings_nl_nl.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/strings_zh_cn.rc
 2018-11-09 16:37:59 +01:00
Rainer Kottenhoff
7e75ddc626 + chg: highlight base developer Flo Balmer in AboutBox 2018-11-09 16:14:43 +01:00
Rainer Kottenhoff
8382a0097b Merge branch 'Dev_Fixes4Release' into Dev_AccelKeys 
# Conflicts:
#	language/np3_af_za/strings_af_za.rc
#	language/np3_be_by/strings_be_by.rc
#	language/np3_de_de/strings_de_de.rc
#	language/np3_en_gb/strings_en_gb.rc
#	language/np3_en_us/strings_en_us.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_nl_nl/strings_nl_nl.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/strings_zh_cn.rc
 2018-11-08 13:03:58 +01:00
Pairi Daiza
a67098718a + RTF1: regression, "Arial Unicode MS" is not exactly the same as "Arial", return to "Arial" 2018-11-07 23:34:08 +01:00
Rainer Kottenhoff
4f7f9aedea Merge branch 'Dev_Fixes4Release' into Dev_AccelKeys 
# Conflicts:
#	language/np3_af_za/strings_af_za.rc
#	language/np3_de_de/strings_de_de.rc
#	language/np3_en_gb/strings_en_gb.rc
#	language/np3_en_us/strings_en_us.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_nl_nl/strings_nl_nl.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/strings_zh_cn.rc
 2018-11-07 21:31:39 +01:00
Pairi Daiza
ef58f383df + RTF1 : replace "fcharsetN Arial" to "fcharsetN Arial Unicode MS" 2018-11-07 17:00:52 +01:00
Rainer Kottenhoff
ab703bf23f + language resources for inconsistent indentation warning 2018-11-07 12:55:10 +01:00
Rainer Kottenhoff
88c33cf6ab Merge branch 'Dev_Fixes4Release' into Dev_AccelKeys 
# Conflicts:
#	language/np3_be_by/strings_be_by.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ru_ru/strings_ru_ru.rc
 2018-11-07 08:31:11 +01:00
Pairi Daiza
a2950a7128 + Translation of some titles of window "About Notepad3" 2018-11-07 00:54:43 +01:00
Rainer Kottenhoff
e8e5588bbb + add: indentation mismatch detection 2018-11-07 00:54:39 +01:00
Rainer Kottenhoff
ddc11d2ff1 + enh: inconsistent indentation option switch 2018-11-06 16:30:10 +01:00
Rainer Kottenhoff
4afc4fd0d4 Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys 
# Conflicts:
#	language/np3_af_za/dialogs_af_za.rc
#	language/np3_be_by/dialogs_be_by.rc
#	language/np3_de_de/dialogs_de_de.rc
#	language/np3_en_gb/dialogs_en_gb.rc
#	language/np3_en_us/dialogs_en_us.rc
#	language/np3_es_es/dialogs_es_es.rc
#	language/np3_fr_fr/dialogs_fr_fr.rc
#	language/np3_ja_jp/dialogs_ja_jp.rc
#	language/np3_nl_nl/dialogs_nl_nl.rc
#	language/np3_ru_ru/dialogs_ru_ru.rc
#	language/np3_zh_cn/dialogs_zh_cn.rc
 2018-11-06 12:01:44 +01:00
Rainer Kottenhoff
ad148d89cc + chg: switch to RichText Edit Control v5.0 (MSFTEDIT.DLL) 2018-11-06 11:05:26 +01:00
Pairi Daiza
d3214ebf16 + About-Box: Maintenance of Contributors list 2018-11-05 19:46:39 +01:00
Rainer Kottenhoff
ea0eabe76a Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys 
# Conflicts:
#	language/np3_af_za/strings_af_za.rc
#	language/np3_be_by/strings_be_by.rc
#	language/np3_de_de/lexer_de_de.rc
#	language/np3_de_de/strings_de_de.rc
#	language/np3_en_gb/strings_en_gb.rc
#	language/np3_en_us/strings_en_us.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_nl_nl/strings_nl_nl.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/menu_zh_cn.rc
#	language/np3_zh_cn/strings_zh_cn.rc
 2018-11-05 14:01:41 +01:00
Pairi Daiza
d973368e13 + fix: order of EOL Mode selection 2018-11-05 10:51:04 +01:00
Rainer Kottenhoff
c9ff930cd0 + fix: order of EOL Mode selection 2018-11-05 10:00:17 +01:00
Rainer Kottenhoff
a0b39c2d2a Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_RC2_fixes 
# Conflicts:
#	language/np3_zh_cn/menu_zh_cn.rc
 2018-11-05 09:58:52 +01:00
Rainer Kottenhoff
6d82460615 + fix: order of EOL Mode selection 2018-11-05 09:52:51 +01:00
Rainer Kottenhoff
70ce384a4b + fix order of EOL mode selection 2018-11-05 09:41:23 +01:00
Liu Hao
bd0b189424 menu_zh_cn.rc: Add translation for 'Clear saved Default Position'. 
Signed-off-by: Liu Hao <lh_mouse@126.com>
 2018-11-05 16:36:34 +08:00
Rainer Kottenhoff
9e71eff167 Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys 
# Conflicts:
#	Versions/build.txt
#	language/np3_af_za/strings_af_za.rc
#	language/np3_be_by/strings_be_by.rc
#	language/np3_en_gb/strings_en_gb.rc
#	language/np3_en_us/strings_en_us.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_nl_nl/strings_nl_nl.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/strings_zh_cn.rc
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
 2018-11-05 08:26:41 +01:00
Liu Hao
a33c8979f7 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>
 2018-11-05 12:10:10 +08:00
Liu Hao
12fce004f4 menu_zh_cn.rc: New translation for 'Selection' and 'Transpose Lines'. 
Signed-off-by: Liu Hao <lh_mouse@126.com>
 2018-11-05 11:56:17 +08:00
Pairi Daiza
0abf157c1b +Add comments to document access to the GitHub site from "craigo -". 2018-11-04 22:03:13 +01:00
Pairi Daiza
7636ba5443 + Correction typo (3 blanks in url) and change some http to htpps sites 2018-11-03 17:23:45 +01:00
Pairi Daiza
75f27847b8
Merge pull request #770 from alexantr/np3_ru 
Translated ru-RU 'About' rtf
 2018-11-03 16:36:51 +01:00
Pairi Daiza
48aa9d78e2 + Translation >ES, FR, NL :clear saved default position 
- Adjust same layout for all languages
 2018-11-03 16:22:14 +01:00
Alex Yashkin
47a7b53d10
Translated ru-RU 'About' rtf 2018-11-03 17:05:16 +03:00
Pairi Daiza
6b2f697745
Merge pull request #768 from maboroshin/master 
Translation >JP :clear saved default position
 2018-11-03 14:32:44 +01:00
Alex Yashkin
00de39061d
Translated new item in ru-RU menu 2018-11-03 16:00:01 +03:00
maboroshin
08fe13df58 Translation >JP :clear saved default position 2018-11-03 17:16:54 +09:00