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,242 Commits 2 Branches 34 Tags 274 MiB
4afc4fd0d4
Commit Graph

2242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
731a633ed7
Merge pull request #779 from RaiKoHoff/Dev_RC2_fixes 
Switch to RichText Edit Control v.5.0 (msftedit.dll) for AboutBox text
 2018-11-06 11:46:32 +01:00
Rainer Kottenhoff
0119158fd0 + fix: increase waiting timeout for GUI tests 2018-11-06 11:38:42 +01:00
Rainer Kottenhoff
dae03cf75d + fix: static text for About box must be reconstructed after module unload 2018-11-06 11:14:24 +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
2044c922a9
Merge pull request #778 from hpwamr/MUI_dev 
+ About-Box: Maintenance of Contributors list
 2018-11-05 20:07:57 +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
b5e1581f35
Merge pull request #777 from hpwamr/MUI_dev 
+ fix: order of EOL Mode selection
 2018-11-05 11:11:12 +01:00
Pairi Daiza
d973368e13 + fix: order of EOL Mode selection 2018-11-05 10:51:04 +01:00
Rainer Kottenhoff
7a60cbeb74
Merge pull request #776 from RaiKoHoff/Dev_RC2_fixes 
Fix: order of EOL Mode selection
 2018-11-05 10:15:33 +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
Pairi Daiza
44a9ebea0e
Merge pull request #775 from lhmouse/master 
menu_zh_cn.rc: Add translation for 'Clear saved Default Position'.
 2018-11-05 09:49:40 +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
Derick Payne
7aa7b363ef
Merge pull request #774 from lhmouse/master 
Update zh_CN translation and fix a bug in EOL selection dialog
 2018-11-05 07:12:54 +02: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
bfeae653f7
Merge pull request #773 from hpwamr/MUI_dev 
+Add comments to document access to the GitHub site from "craigo-".
 2018-11-04 22:14:25 +01: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
e2be2c7cef
Merge pull request #772 from hpwamr/MUI_dev 
+ Correction typo (3 blanks in url) and change some http to https sites
 2018-11-03 17:34:12 +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
32774228f6
Merge pull request #771 from hpwamr/MUI_dev 
+ Translation >ES, FR, NL :clear saved default position
 2018-11-03 16:30:44 +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
Pairi Daiza
7eec52a986
Merge pull request #769 from alexantr/np3_ru 
Translated new item in ru-RU menu
 2018-11-03 14:31:32 +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
Pairi Daiza
5b91783968
Merge pull request #767 from hpwamr/MUI_dev 
+ MUI - Reorganization of menus
 2018-11-03 07:54:19 +01:00
Pairi Daiza
ee09066fc5 + MUI - Reorganization of menus 
- Move "Window Title Display' to sub-menu "Window"
 2018-11-03 07:44:56 +01:00
Rainer Kottenhoff
ac43f9fa07
Merge pull request #766 from RaiKoHoff/Dev_RC2_fixes 
Add: menu to clear saved default position
 2018-11-03 00:17:29 +01:00
Rainer Kottenhoff
aa65cbd2f5 + add: menu to clear saved default position 2018-11-03 00:09:07 +01:00
Pairi Daiza
58768ac657
Merge pull request #765 from hpwamr/MUI_dev 
+ Add some comments for "craigo-" url
 2018-11-02 23:08:04 +01:00
Pairi Daiza
93de101afb + Add some comments for "craigo-" url 2018-11-02 22:58:01 +01:00
Pairi Daiza
3f925d42d7
Merge pull request #764 from hpwamr/MUI_dev 
+ Correction for the standardization of layout of "strings_…xx_yy.rc"
 2018-11-02 21:52:41 +01:00
Pairi Daiza
db4a94c9d9 + Correction for the standardization of the presentation of "strings_xx_yy.rc" 
- Standardization of the name of the authors of the translation
- Correction of GitHub site name for: "craigo-"
 2018-11-02 21:39:29 +01:00
Rainer Kottenhoff
7fdaac0271 Merge branch 'Dev_RC2_fixes' 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_zh_cn/strings_zh_cn.rc
 2018-11-02 16:33:17 +01:00
Rainer Kottenhoff
9feaf9d22a
Merge pull request #763 from RaiKoHoff/Dev_RC2_fixes 
Refactoring: move common resource strings
 2018-11-02 16:20:25 +01:00
Rainer Kottenhoff
ba4bce8b99 + refactoring: move common resource strings 2018-11-02 16:11:45 +01:00
Rainer Kottenhoff
e06b01a7a4 + fix: merge conflicts (manual compare) 2018-11-02 12:50:47 +01:00
Rainer Kottenhoff
f06bc4852e
Merge pull request #762 from RaiKoHoff/Dev_RC2_fixes 
Add alexantr (Alex Yashkin) to Acknowledgments of About box
 2018-11-02 12:19:47 +01:00
Rainer Kottenhoff
83c4f581d2 Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys 
# Conflicts:
#	language/np3_af_za/strings_af_za.rc
#	language/np3_be_by/dialogs_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/dialogs_ru_ru.rc
#	language/np3_zh_cn/strings_zh_cn.rc
 2018-11-02 12:13:48 +01:00
Rainer Kottenhoff
cd9816651b + add: alexantr (Alex Yashkin) to Acknowledgments of About box 2018-11-02 12:05:07 +01:00
Derick Payne
1fe229abd6
Merge pull request #761 from alexantr/np3_ru 
Russian translation
 2018-11-02 01:58:14 +02:00
Alex Yashkin
94ee983679
Fixed conflicts 2018-11-02 01:47:54 +03:00