Rainer Kottenhoff
97fc9d2437
+ enh: nicer Splash image for Notepad3Portable
2018-11-08 21:31:22 +01:00
Rainer Kottenhoff
54497a63ca
Merge branch 'Dev_Fixes4Release' into Dev_AccelKeys
...
# Conflicts:
# Versions/build.txt
# res/Notepad3.exe.manifest.conf
# src/Version.h
# src/VersionEx.h
2018-11-08 18:18:27 +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
Rainer Kottenhoff
ddfe313402
+ enh: PortableApps dev
2018-11-08 16:10:36 +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
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
Rainer Kottenhoff
0d9e9c38aa
+ NP3Portable: prepare for beta testing
2018-11-07 23:45:18 +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
2d9a30dbe1
+ enh: Notepad3Portable Image
2018-11-07 22:17:55 +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
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
Rainer Kottenhoff
086b87a992
+ add: Notepad3Portable splash screens
2018-11-07 16:55:43 +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
Rainer Kottenhoff
b21ee76e8f
Merge branch 'Dev_Fixes4Release' into Dev_AccelKeys
2018-11-07 12:59:55 +01:00
Rainer Kottenhoff
ab703bf23f
+ language resources for inconsistent indentation warning
2018-11-07 12:55:10 +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
Rainer Kottenhoff
6902bae473
+ refactoring: move some g_lobals to common structure
2018-11-07 09:27:15 +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
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
Rainer Kottenhoff
e8e5588bbb
+ add: indentation mismatch detection
2018-11-07 00:54:39 +01:00
Derick Payne
8f3e242990
Releasing RC2 Build 1434
2018-11-06 22:54:15 +02: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
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
