Commit Graph

2173 Commits

Author SHA1 Message Date
Rainer Kottenhoff
b5a2deb0de Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys 2018-10-31 16:52:37 +01:00
Rainer Kottenhoff
66e07d6420 + enh: add indentation mode mixed-up detection 2018-10-31 16:49:16 +01:00
Pairi Daiza
bd225e9c2e
Merge pull request #754 from hpwamr/MUI_dev
+ Reorganization of menus for: es-ES,  fr-FR, nl-NL (Final stage)
2018-10-31 16:34:38 +01:00
Pairi Daiza
c849bedf33 + Reorganization of menus for: es-ES, fr-FR, nl-NL (Final stage) 2018-10-31 16:23:49 +01:00
Rainer Kottenhoff
bcd6451d39 + enh: add switch and opacity level settings2 for Find/Replace dialog 2018-10-31 15:00:24 +01:00
Rainer Kottenhoff
5952236d95 + clean: lean and mean Onigmo RegEx 2018-10-31 11:03:50 +01:00
Rainer Kottenhoff
ac8c4abd87 Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys 2018-10-31 09:15:33 +01:00
Pairi Daiza
df6261ab44
Merge pull request #753 from lhmouse/master
np3_zh_cn/menu_zh_cn.rc: Update menu translation for zh_CN.
2018-10-31 04:29:24 +01:00
Liu Hao
a089546161 np3_zh_cn/menu_zh_cn.rc: Update menu translation for zh_CN.
Signed-off-by: Liu Hao <lh_mouse@126.com>
2018-10-31 10:21:41 +08:00
Pairi Daiza
d27956ab5b
Merge pull request #752 from hpwamr/MUI_dev
+ Adjust layout of : IDS_MUI_ABOUT_RTF_1 and IDS_MUI_ABOUT_RTF_2
2018-10-30 22:14:29 +01:00
Pairi Daiza
197370a671 + Adjust layout of : IDS_MUI_ABOUT_RTF_1 and IDS_MUI_ABOUT_RTF_2 2018-10-30 22:04:43 +01:00
Pairi Daiza
c613dd219c
Merge pull request #751 from hpwamr/MUI_dev
+ Reorganization of menus for Japanese/Japan (ja-JPN)
2018-10-30 21:02:26 +01:00
Pairi Daiza
8075c25865 + Reorganization of menus for Japanese/Japan (ja-JPN) 2018-10-30 20:49:30 +01:00
Pairi Daiza
adbdc30316
Merge pull request #750 from hpwamr/MUI_dev
+ Reorganization of menus for Chinese Simplified/China (zh-CN)
2018-10-30 18:23:28 +01:00
Pairi Daiza
0343973831 + Reorganization of menus for Chinese Simplified/China (zh-CN) 2018-10-30 18:10:56 +01:00
Rainer Kottenhoff
75c43f4ed6 Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_AccelKeys 2018-10-30 14:58:24 +01:00
Rainer Kottenhoff
4843f09b44
Merge pull request #747 from RaiKoHoff/Dev_RC2_fixes
Fix: 2nd Keyword for C++ Lexer Styling got wrong ID
2018-10-30 14:54:22 +01:00
Rainer Kottenhoff
dea891d22a + fix: 2nd Keyword for C++ Lexer Styling got wrong ID 2018-10-30 14:46:10 +01:00
Rainer Kottenhoff
554a84aff7
Merge pull request #745 from RaiKoHoff/Dev_RC2_fixes
Fix for consecutive deleting and undo
2018-10-30 11:07:03 +01:00
Rainer Kottenhoff
8489368976 Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys 2018-10-30 11:04:35 +01:00
Rainer Kottenhoff
1212db1ee5 + (re-)fix issue #166 (DEL) 2018-10-30 10:57:13 +01:00
Rainer Kottenhoff
ba5dca06ba + clang tidy 2018-10-30 10:47:51 +01:00
Rainer Kottenhoff
98de890ed2
Merge pull request #744 from RaiKoHoff/Dev_RC2_fixes
Fix for consecutive backspacing and undo
2018-10-30 09:26:15 +01:00
Rainer Kottenhoff
eb422fca80 Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys 2018-10-30 09:11:54 +01:00
Rainer Kottenhoff
a9056abc39 + (re-)fix issue #166 2018-10-30 09:09:12 +01:00
Pairi Daiza
d2a1f9ed6c
Merge pull request #743 from hpwamr/MUI_dev
+ Minor correction of text alignment of 1 sub-menu
2018-10-30 06:50:16 +01:00
Pairi Daiza
2c71c2f562 + Minor correction of text alignment of 1 sub-menu 2018-10-30 06:31:16 +01:00
Pairi Daiza
1bffee17c2
Merge pull request #742 from lhmouse/master
menu_zh_cn.rc: Update translation for zh_CN.
2018-10-30 06:28:54 +01:00
Liu Hao
baf6834b81 menu_zh_cn.rc: Update translation for zh_CN.
Signed-off-by: Liu Hao <lh_mouse@126.com>
2018-10-30 10:34:53 +08:00
Pairi Daiza
6670b9b2a9
Merge pull request #741 from hpwamr/MUI_dev
+ Minor correction of text alignment of 2 sub-menus
2018-10-29 22:51:40 +01:00
Pairi Daiza
4aa24cd58c + Minor correction of text alignment of 2 sub-menus 2018-10-29 22:42:00 +01:00
Pairi Daiza
0f803255bf + Minor correction of text alignment of 2 sub-menus 2018-10-29 22:27:05 +01:00
Rainer Kottenhoff
0953d90385 Merge branch 'Dev_RC2_fixes' into Dev_AccelKeys 2018-10-29 22:10:25 +01:00
Rainer Kottenhoff
97f0b86d51
Merge pull request #740 from RaiKoHoff/Dev_RC2_fixes
German menu fixes
2018-10-29 22:09:20 +01:00
Rainer Kottenhoff
617d2d899d + fix: German menu corrections 2018-10-29 21:45:12 +01:00
Rainer Kottenhoff
54033b7384 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_RC2_fixes
# Conflicts:
#	language/np3_de_de/menu_de_de.rc
2018-10-29 21:42:40 +01:00
Rainer Kottenhoff
6999d448f7 + fix: Germen menu changes 2018-10-29 21:41:30 +01:00
Rainer Kottenhoff
b7e1f5e5d3
Merge pull request #739 from hpwamr/MUI_dev
+ Minor correction of some aligning of text
2018-10-29 21:39:57 +01:00
Pairi Daiza
2d3d11f463 + Minor correction of some aligning of text 2018-10-29 21:27:23 +01:00
Rainer Kottenhoff
fb4cad9cc7 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_AccelKeys 2018-10-29 21:11:26 +01:00
Pairi Daiza
622c173440
Merge pull request #738 from hpwamr/MUI_dev
Mui dev - Add MiniPath Balarusian (be-BY) and Russian (ru-RU) languages.
2018-10-29 16:55:35 +01:00
Pairi Daiza
e1bcedfaab + new MiniPath language Russian (ru-RU) 2018-10-29 16:24:28 +01:00
Pairi Daiza
79675eb9b2 + new MiniPath language Belarusian (be-BY) 2018-10-29 16:23:05 +01:00
Rainer Kottenhoff
4b5bd76568 Merge branch 'Dev_lng_beBY_ruRU' into Dev_AccelKeys 2018-10-29 12:04:24 +01:00
Rainer Kottenhoff
58f7107e22
Merge pull request #737 from RaiKoHoff/Dev_lng_beBY_ruRU
Synchronize Minipath project files (new language template)
2018-10-29 10:31:23 +01:00
Rainer Kottenhoff
d3af3ece8a + synchronize Minipath project files (new language template) 2018-10-29 10:03:22 +01:00
Rainer Kottenhoff
a186275883 + resolving merge conflicts 2018-10-29 08:52:31 +01:00
Rainer Kottenhoff
f52f3baeeb Merge branch 'Dev_lng_beBY_ruRU' 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-10-29 08:33:06 +01:00
Rainer Kottenhoff
ddfe570794
Merge pull request #736 from RaiKoHoff/Dev_lng_beBY_ruRU
Fixing Notepad3 language mui dll project settings
2018-10-28 10:19:32 +01:00
Rainer Kottenhoff
69a5825f13 + fix: Notepad3 language mui dll project settings 2018-10-28 10:05:24 +01:00