Commit Graph

2215 Commits

Author SHA1 Message Date
Rainer Kottenhoff
0ed4c19a53
Merge pull request #790 from RaiKoHoff/Dev_Fixes4Release
Highlight base developer Flo Balmer in AboutBox
2018-11-09 16:25:53 +01:00
Rainer Kottenhoff
7e75ddc626 + chg: highlight base developer Flo Balmer in AboutBox 2018-11-09 16:14:43 +01:00
Rainer Kottenhoff
e8b81a4815
Merge pull request #789 from RaiKoHoff/Dev_Fixes4Release
Finalized Notepad3Portable splash screen
2018-11-09 09:25:37 +01:00
Rainer Kottenhoff
9d10848fd4 + chg: finalized Notepad3Portable splash screen 2018-11-09 09:24:27 +01:00
Rainer Kottenhoff
87b54b8915
Merge pull request #788 from RaiKoHoff/Dev_Fixes4Release
Nicer Splash image for Notepad3Portable
2018-11-08 21:32:24 +01:00
Rainer Kottenhoff
97fc9d2437 + enh: nicer Splash image for Notepad3Portable 2018-11-08 21:31:22 +01:00
Rainer Kottenhoff
799d01c4ae
Merge pull request #787 from RaiKoHoff/Dev_Fixes4Release
Preparations for PortableApps.com distribution
2018-11-08 18:06:49 +01:00
Rainer Kottenhoff
20d024466a + chg: preparations for PortableApps.com distribution 2018-11-08 17:50:11 +01:00
Pairi Daiza
a8b140e62d
Merge pull request #786 from hpwamr/MUI_dev
+ RTF1: regression, "Arial Unicode MS" is not exactly the same as "Arial", return to "Arial"
2018-11-08 00:17:26 +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
Pairi Daiza
abd821e4d9
Merge pull request #785 from hpwamr/MUI_dev
+ Update "v5.18.1106.1434 RC2" Changes list
2018-11-07 18:56:04 +01:00
Pairi Daiza
1d3424d97d + Update "v5.18.1106.1434 RC2" Changes list 2018-11-07 18:46:30 +01:00
Pairi Daiza
247e82b9bd
Merge pull request #784 from hpwamr/MUI_dev
+ RTF1 : replace "fcharsetN Arial" to "fcharsetN Arial Unicode MS"
2018-11-07 17:09:07 +01:00
Pairi Daiza
ef58f383df + RTF1 : replace "fcharsetN Arial" to "fcharsetN Arial Unicode MS" 2018-11-07 17:00:52 +01:00
Pairi Daiza
fe13bdf1c2
Merge pull request #783 from hpwamr/MUI_dev
+ Update the "v5.18.1106.1434 RC2 Changes" list
2018-11-07 15:31:08 +01:00
Pairi Daiza
4ae6ce59bb + Update the "v5.18.1106.1434 RC2 Changes" list 2018-11-07 15:07:13 +01:00
Pairi Daiza
e5da05ed91
Merge pull request #782 from hpwamr/MUI_dev
+ Update the "TRANSLATIONS (MUI)" list
2018-11-07 11:11:28 +01:00
Pairi Daiza
854e2823e3 + Update the "TRANSLATIONS (MUI)" list 2018-11-07 11:04:41 +01:00
Pairi Daiza
068ac3e836 + Update the "TRANSLATIONS (MUI)" list 2018-11-07 10:58:30 +01:00
Pairi Daiza
4cd91aae7d
Merge pull request #781 from hpwamr/MUI_dev
+ Translation of some titles of window "About Notepad3"
2018-11-07 01:03:01 +01:00
Pairi Daiza
a2950a7128 + Translation of some titles of window "About Notepad3" 2018-11-07 00:54:43 +01:00
Derick Payne
8f3e242990 Releasing RC2 Build 1434 2018-11-06 22:54:15 +02: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
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
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
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