Commit Graph

2313 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
aee9239af9 + add: VS v.15.9 new compiler version 2018-11-15 14:08:38 +01:00
Rainer Kottenhoff
14063d5741 + enh: .editorconfig (UTF-8 affine) for VisualStudio editor 2018-11-15 12:49:32 +01:00
Rainer Kottenhoff
ae28a8e125
Merge pull request #807 from RaiKoHoff/Dev_RC2_UTF8
UTF-8 encoding based resource files (*.rc)
2018-11-15 12:00:17 +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
e5fc9d94cc
Merge pull request #806 from hpwamr/MUI_dev
+ MUI: RTF "About" Titles in ja-JP - correction (maboroshin translation)
2018-11-13 16:28:20 +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
1bcf74b693
Merge pull request #805 from RaiKoHoff/Dev_Fixes4Release
Transform: Command-Line-Help Message-box to dialog
2018-11-13 12:17:15 +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
Rainer Kottenhoff
faff0e0f3a Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_Fixes4Release 2018-11-13 08:27:48 +01:00
Pairi Daiza
e9296f227a
Merge pull request #803 from hpwamr/MUI_dev
Mui dev : Adjustemeni in "About Notepad3"
2018-11-13 00:51:44 +01:00
Pairi Daiza
5a59e3b3a6 + Add [Languages] "SPANISH=true" 2018-11-13 00:42:02 +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
Rainer Kottenhoff
94fc854e2d + bugfix: from Onigmo upstream master 2018-11-12 16:34:10 +01:00
Pairi Daiza
dd581ba03f
Merge pull request #801 from alexantr/be-ru
ru-RU: missed tab symbol in IDS_MUI_CMDLINEHELP
2018-11-11 23:18:01 +01:00
Alex Yashkin
3d598a7119 ru-RU: missed tab symbol in IDS_MUI_CMDLINEHELP 2018-11-11 22:44:31 +03:00
Pairi Daiza
e02d824b49
Merge pull request #796 from alexantr/np3_be_ru
Belarusian full translation and some Russian fixes
2018-11-11 17:49:02 +01: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
55db6e4893
Merge pull request #795 from hpwamr/MUI_dev
+ MUI: RTF "About" strings in zh-CN - correction titles
2018-11-11 17:07:47 +01: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
5bd5183788
Merge pull request #794 from hpwamr/MUI_dev
+ MUI: RTF "About" strings - Use same Syntax as ja-JP and zh-CN
2018-11-11 10:35:47 +01: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
d160ff6ed1
Merge pull request #793 from hpwamr/MUI_dev
+ Revert to "Arial" instead of "Arial Unicode MS"
2018-11-11 01:17:42 +01:00
Pairi Daiza
453dadb3bf + Revert to "Arial" instead of "Arial Unicode MS" 2018-11-11 01:10:37 +01:00
Pairi Daiza
6d6189d7b0
Merge pull request #792 from hpwamr/MUI_dev
+ RTF translation of some titles of the "About" window in "ja-JP" and "zh-CN
2018-11-10 20:57:24 +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
b2d6fe5be8
Merge pull request #791 from hpwamr/MUI_dev
+ Translation in About the item: "Development" in fr-FR, nl-NL and es-ES
2018-11-09 19:54:15 +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
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
fa1f77a425 Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_AccelKeys 2018-11-09 11:20:58 +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
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