Commit Graph

5100 Commits

Author SHA1 Message Date
Rainer Kottenhoff
66f5407bdf
Merge pull request #2115 from RaiKoHoff/NewFeatures
Update to current RC3/Release DEV
2020-03-16 17:07:55 +01:00
RaiKoHoff
e69e45c2f2 Merge remote-tracking branch 'upstream/master' into NewFeatures
# Conflicts:
#	src/Edit.c
#	src/Notepad3.c
#	src/Notepad3.h
2020-03-16 17:03:50 +01:00
Rainer Kottenhoff
57239f0903
Merge pull request #2113 from RaiKoHoff/RC2_DEV
Try "hardening" selection undo/redo behavior
2020-03-16 16:50:27 +01:00
RaiKoHoff
6be020d7b5 + chg: try "hardening" selection undo/redo behavior 2020-03-16 16:33:08 +01:00
RaiKoHoff
6326680ae0 + upd: Keyboard Shortcut Doc 2020-03-16 10:32:14 +01:00
RaiKoHoff
42263fc246 + upd: Oniguruma current DEV (2020-03-16) 2020-03-16 10:06:25 +01:00
RaiKoHoff
1704659b48 Merge remote-tracking branch 'upstream/master' into NewFeatures 2020-03-16 09:31:57 +01:00
RaiKoHoff
2e4bed6668 Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-16 09:31:04 +01:00
Pairi Daiza
804ebc157f
Merge pull request #2112 from hpwamr/mui
Mui
2020-03-15 22:22:54 +01:00
Pairi Daiza
6a0f100aa1 Merge branch 'mui' 2020-03-15 22:20:28 +01:00
Pairi Daiza
e364e447d8
Merge pull request #2111 from hpwamr/mui
+upd: Update "KeyboardShortcuts.txt"
2020-03-15 22:18:41 +01:00
Pairi Daiza
af2f248ab2 +upd: Update "KeyboardShortcuts.txt" 2020-03-15 22:16:58 +01:00
Pairi Daiza
3cde251e7b +upd: Update "KeyboardShortcuts.txt" 2020-03-15 22:06:59 +01:00
Pairi Daiza
46993ea512
Merge pull request #2108 from maboroshin/master
Translation: menu_ja_jp.rc DPI
2020-03-14 16:44:50 +01:00
Pairi Daiza
2c6d406ab8
Merge pull request #2110 from hpwamr/mui
+ upd: Version files for ja-JP translation
2020-03-14 16:44:32 +01:00
Pairi Daiza
9eae8b6af2 + upd: Version files for ja-JP translation 2020-03-14 16:37:27 +01:00
Rainer Kottenhoff
1af54e49dc Merge branch 'RC2_DEV' into NewFeatures 2020-03-14 15:42:17 +01:00
Rainer Kottenhoff
26db77298c + fix: some compiler warnings 2020-03-14 15:41:20 +01:00
Rainer Kottenhoff
5f70dd8d33 + fix: compiler warnings 2020-03-14 15:09:57 +01:00
Rainer Kottenhoff
f57cbdef1b Merge branch 'RC2_DEV' into NewFeatures 2020-03-14 15:02:31 +01:00
Rainer Kottenhoff
6b1b29fa9d
Merge pull request #2109 from RaiKoHoff/RC2_DEV
Fix: smarter delimiter detection for CSV Rainbow Lexer
2020-03-14 15:01:09 +01:00
Rainer Kottenhoff
9e6179f5f1 + add: CSV Rainbow test file 2020-03-14 14:46:50 +01:00
Rainer Kottenhoff
3f6b97c7da + fix: smarter delimiter detection for CSV Rainbow Lexer 2020-03-14 14:43:17 +01:00
maboroshin
0450da5b8f
Translation: menu_ja_jp.rc 2020-03-14 19:17:49 +09:00
Rainer Kottenhoff
5200bab7be + add: ToDo BackLog text file 2020-03-14 10:42:17 +01:00
Rainer Kottenhoff
935fbe229e Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures 2020-03-13 20:56:50 +01:00
Rainer Kottenhoff
992f66a386
Merge pull request #2107 from RaiKoHoff/RC2_DEV
Fix locked ini-file handling: create empty file…
2020-03-13 20:52:34 +01:00
Rainer Kottenhoff
d8f278c84e + fix: locked ini-file handling: create empty file if not exist for writing (style export) 2020-03-13 20:42:46 +01:00
Rainer Kottenhoff
2069c44bc9 Merge branch 'RC2_DEV' into NewFeatures 2020-03-13 02:01:53 +01:00
Rainer Kottenhoff
6a2320c497
Merge pull request #2105 from RaiKoHoff/RC2_DEV
Fix .ini-file writing bug introduced in previous version
2020-03-13 02:01:26 +01:00
Rainer Kottenhoff
855fab8d8f + fix: .ini-file writing bug introduced in previous version 2020-03-13 01:52:41 +01:00
Rainer Kottenhoff
25a8d65ef5
Merge pull request #2104 from RaiKoHoff/RC2_DEV
Notepad3 installed version: no write access locking...
2020-03-13 00:54:15 +01:00
Rainer Kottenhoff
0d39bf7749 + fix: NP3 installed version: no write access locking on programs dir (.ini redirection) 2020-03-13 00:46:41 +01:00
Rainer Kottenhoff
be8088f47a Merge branch 'RC2_DEV' into NewFeatures 2020-03-12 23:59:18 +01:00
Rainer Kottenhoff
21684aed8d
Merge pull request #2102 from RaiKoHoff/RC2_DEV
Fix German translation for changed menu items
2020-03-12 22:48:31 +01:00
Rainer Kottenhoff
a802203b52 + fix: German translation for changed menu items
(cherry picked from commit b35f5cd113)
2020-03-12 22:34:59 +01:00
Rainer Kottenhoff
b35f5cd113 + fix: German translation for changed menu items 2020-03-12 22:32:40 +01:00
Rainer Kottenhoff
c7e1e30ff8 Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures 2020-03-12 22:18:05 +01:00
Pairi Daiza
0b3a129911
Merge pull request #2101 from hpwamr/mui
MUI - Minor translation for "pl-PL"
2020-03-12 19:45:27 +01:00
Pairi Daiza
827a486c3a MUI - Minor translation for "pl-PL"
+add Versioning files
2020-03-12 19:37:18 +01:00
Pairi Daiza
52f8e0ce6d
Merge pull request #2100 from hpwamr/mui
MUI - Minor translation for "it-IT"
2020-03-12 19:27:07 +01:00
Pairi Daiza
4e731f5394 MUI - Minor translation for "it-IT"
+add Versioning files
2020-03-12 19:18:21 +01:00
Pairi Daiza
4110f3cf19
Merge pull request #2099 from hpwamr/mui
+ upd: Version files for hu-HU translation
2020-03-12 18:35:02 +01:00
Pairi Daiza
a70a0cdb26
Merge pull request #2098 from xsak/master
RC3 Hungarian translation
2020-03-12 18:34:50 +01:00
Pairi Daiza
88aacb0b20 + upd: Version files for hu-HU translation 2020-03-12 18:20:38 +01:00
Akos Keresztes
a96caae7ee Merge remote-tracking branch 'upstream/master' 2020-03-12 18:08:23 +01:00
Akos Keresztes
c909c35d80 RC3 Hungarian translation 2020-03-12 18:07:44 +01:00
Pairi Daiza
1b08b4055b
Merge pull request #2095 from lhmouse/master
language/np3_zh_cn: Update translation for zh_CN
2020-03-12 18:07:29 +01:00
Pairi Daiza
cb13b665f2
Merge pull request #2097 from hpwamr/mui
+ upd: Version files for update translation into zh_CN
2020-03-12 18:07:11 +01:00
Pairi Daiza
b55917e839
Merge branch 'master' into mui 2020-03-12 18:07:02 +01:00