Commit Graph

5147 Commits

Author SHA1 Message Date
Rainer Kottenhoff
12e033ae97
Merge pull request #2136 from RaiKoHoff/NewFeatures
grepWin integration enhancement
2020-03-19 15:41:08 +01:00
RaiKoHoff
ca9ece5b7a + enh: move grepWin fixed cmdline options to grepwi.ini file 2020-03-19 15:34:27 +01:00
RaiKoHoff
00441b97a6 Merge remote-tracking branch 'upstream/master' into NewFeatures 2020-03-19 15:12:48 +01:00
Pairi Daiza
8d5dc8b79e
Merge pull request #2135 from lhmouse/master
language/np3_zh_cn: Update translation for zh_CN
2020-03-19 14:50:51 +01:00
Liu Hao
8591864e8e language/np3_zh_cn: Update translation for zh_CN 2020-03-19 21:34:53 +08:00
Pairi Daiza
8bea163bec
Merge pull request #2134 from lhmouse/master
language/np3_zh_cn: Update translation for zh_CN
2020-03-19 13:53:13 +01:00
Pairi Daiza
3b6f55bbc0
Merge pull request #2133 from hpwamr/mui
MUI - Minor translation for "Swedish" language.
2020-03-19 13:52:12 +01:00
Liu Hao
31ae946910 language/np3_zh_cn: Update translation for zh_CN 2020-03-19 20:11:13 +08:00
Pairi Daiza
9004cc4107 MUI - Minor translation for "Swedish" language. 2020-03-19 12:15:14 +01:00
RaiKoHoff
4f2d0bbd7b Merge remote-tracking branch 'upstream/master' into NewFeatures
# Conflicts:
#	Versions/day.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
2020-03-19 11:41:17 +01:00
Pairi Daiza
60fa86daaf
Merge pull request #2132 from hpwamr/mui
+ upd: Version files for Belarusian and Russian translations
2020-03-19 00:37:41 +01:00
Pairi Daiza
51d277dd3f
Merge pull request #2131 from alexantr/be-ru
Update translation in be-BY and ru-RU
2020-03-19 00:37:32 +01:00
Pairi Daiza
77ac8a8a98 + upd: Version files for Belarusian and Russian translations 2020-03-19 00:25:45 +01:00
Alex Yashkin
dbb234ef96
Update translation in be-BY and ru-RU 2020-03-19 02:17:24 +03:00
Pairi Daiza
decfe6cebe
Merge pull request #2129 from xsak/master
RC3 Hungarian translation again
2020-03-19 00:06:59 +01:00
Pairi Daiza
51f7b41ac6
Merge pull request #2130 from hpwamr/mui
+ upd: Version files for Hungarian translation
2020-03-19 00:06:45 +01:00
Pairi Daiza
0eb0ffcb5f + upd: Version files for Hungarian translation 2020-03-18 23:42:08 +01:00
Akos Keresztes
aa20d3c4c6 RC3 Hungarian translation again 2020-03-18 22:44:44 +01:00
Pairi Daiza
9d2f390cfb
Merge pull request #2128 from hpwamr/mui
+ chg: Correction typo
2020-03-18 22:25:17 +01:00
Pairi Daiza
15d96e4f06 + chg: Correction typo 2020-03-18 22:24:53 +01:00
Rainer Kottenhoff
0a8d455312 Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures 2020-03-18 01:32:55 +01:00
Rainer Kottenhoff
f9734b8689 + add: grepWin integration part 2 2020-03-18 01:32:17 +01:00
Pairi Daiza
e6a3d7ced6
Merge pull request #2124 from hpwamr/mui
+ chg: Correction typo
2020-03-17 23:13:03 +01:00
Pairi Daiza
0bb39392c8 + chg: Correction typo 2020-03-17 23:12:30 +01:00
Rainer Kottenhoff
6b21c1548f Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures 2020-03-17 21:08:25 +01:00
Rainer Kottenhoff
71bab8728e
Merge pull request #2123 from RaiKoHoff/RC2_DEV
Fix: German translation for some strings
2020-03-17 21:05:53 +01:00
Rainer Kottenhoff
fea8385a68 + fix: German translation for some strings 2020-03-17 21:05:15 +01:00
RaiKoHoff
b2ddb08f54 + add: grepWin integration: multi file search 2020-03-17 18:39:13 +01:00
Pairi Daiza
404c88f309
Merge pull request #2121 from hpwamr/mui
+ chg: Correction typo for: "..\Build\Docs"
2020-03-17 18:23:21 +01:00
Pairi Daiza
ac1e3b8a41 + chg: Correction typo for: "..\Build\Docs" 2020-03-17 18:09:53 +01:00
Pairi Daiza
d94cf897a1
Merge pull request #2120 from hpwamr/mui
+ chg: Preparation Changes.txt for Release version
2020-03-17 17:23:20 +01:00
Pairi Daiza
5e077c626b + chg: Preparation Changes.txt for Release version 2020-03-17 16:29:20 +01:00
RaiKoHoff
f02b4766c8 Merge branch 'RC2_DEV' into NewFeatures 2020-03-17 14:40:17 +01:00
Rainer Kottenhoff
1d3cda429d
Merge pull request #2119 from RaiKoHoff/RC2_DEV
Changes.txt review
2020-03-17 14:19:28 +01:00
RaiKoHoff
f04d32c9ef + chk: review Changes.txt 2020-03-17 14:12:53 +01:00
RaiKoHoff
ca3c946e51 Merge branch 'RC2_DEV' into NewFeatures 2020-03-17 11:07:54 +01:00
RaiKoHoff
8a505cac0a Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-17 11:07:24 +01:00
Rainer Kottenhoff
f04ca68faf
Merge pull request #2118 from RaiKoHoff/RC2_DEV
Changed: Focused-View scrolling
2020-03-17 09:57:55 +01:00
RaiKoHoff
f51fafda10 + chg: optional scroll to caret position 2020-03-17 09:43:55 +01:00
RaiKoHoff
f3ee0029c7 + fix: Focused-View scrolling 2020-03-17 08:45:28 +01:00
RaiKoHoff
8cf1ba6be9 Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-17 08:43:58 +01:00
Pairi Daiza
77478ca30f
Merge pull request #2117 from hpwamr/mui
MUI - Minor update in "Command Line Help" list
2020-03-16 21:51:54 +01:00
Pairi Daiza
1ab41ce1fe + upd: Versioning files 2020-03-16 21:32:27 +01:00
Pairi Daiza
61b0acb427 MUI - Minor update in "Command Line Help" list
- translation added loine in es-ES, fr-FR and nl-NL
2020-03-16 21:31:05 +01:00
Pairi Daiza
e35e425e97
Merge pull request #2116 from hpwamr/mui
+upd: Minor update in "KeyboardShortcuts.txt"
2020-03-16 17:30:01 +01:00
Pairi Daiza
1c44eb1966 +upd: Minor update in "KeyboardShortcuts.txt"
- add "Oniguruma_RE.txt" in Installer and NotepadPortable doc
2020-03-16 17:22:05 +01:00
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
RaiKoHoff
7e10a03049 Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-16 16:51:43 +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