Commit Graph

5172 Commits

Author SHA1 Message Date
Rainer Kottenhoff
cfce53daa6
Merge pull request #2143 from RaiKoHoff/NewFeatures
Integrate language files for grepWin
2020-03-21 01:18:09 +01:00
Rainer Kottenhoff
174f129ae4 + enh: integrate language files for grepWin 2020-03-21 01:14:21 +01:00
Rainer Kottenhoff
66a4f7c52d Merge branch 'RC2_DEV' into NewFeatures 2020-03-20 23:48:23 +01:00
Rainer Kottenhoff
2b5a76bb54
Merge pull request #2142 from RaiKoHoff/RC2_DEV
Normalized view position on FileLoad (historic caret position)
2020-03-20 23:47:03 +01:00
Rainer Kottenhoff
ca93ea7ca2 Merge remote-tracking branch 'notepad3_orig_rizone/master' into RC2_DEV 2020-03-20 23:36:25 +01:00
Pairi Daiza
490e4af4f7
Merge pull request #2141 from hpwamr/mui
+ chg: Change Rizonesoft Copyright © to year "2020" (thanks to "grepWin")
2020-03-20 18:50:53 +01:00
Pairi Daiza
f2e0633476 + upd: Versioning files 2020-03-20 18:44:21 +01:00
Pairi Daiza
5adb0c9c35 Change Rizonesoft Copyright © to year "2020" (thanks to "grepWin") 2020-03-20 18:42:11 +01:00
RaiKoHoff
ce039f9154 + fix: normalized view position on FileLoad (historic caret pos) 2020-03-20 17:00:59 +01:00
RaiKoHoff
6a8ba410fc Merge remote-tracking branch 'upstream/NewFeatures' into NewFeatures 2020-03-20 16:00:24 +01:00
Rainer Kottenhoff
8ea03c486b
Merge pull request #2140 from RaiKoHoff/NewFeatures
Normalized ScrollToLine View (JumpTo, Find Fwrd/Backw, etc.)
2020-03-20 14:56:17 +01:00
RaiKoHoff
ca450c558a Merge remote-tracking branch 'upstream/master' into NewFeatures
# Conflicts:
#	src/VersionEx.h
2020-03-20 14:54:44 +01:00
Rainer Kottenhoff
73daa67ba1
Merge pull request #2139 from RaiKoHoff/RC2_DEV
Normalized ScrollToLine View (JumpTo, Find Fwrd/Backw, etc.)
2020-03-20 14:50:23 +01:00
RaiKoHoff
a264f6bce2 + chg: Normalized ScrollToLine View (JumpTo, Find Fwrd/Backw, etc.), 2020-03-20 14:41:39 +01:00
RaiKoHoff
5230eabe35 Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-20 11:32:49 +01:00
Pairi Daiza
8fd5ef12c4
Merge pull request #2138 from hpwamr/mui
+ver: VS2019 version update - VS 16.5.0
2020-03-20 10:33:09 +01:00
Pairi Daiza
0e3813e402 +ver: VS2019 version update - VS 16.5.0 2020-03-20 10:14:20 +01:00
Rainer Kottenhoff
1075bc4e2a Merge remote-tracking branch 'notepad3_orig_rizone/master' into NewFeatures 2020-03-19 20:08:05 +01:00
Rainer Kottenhoff
d1c78eb694 Merge remote-tracking branch 'notepad3_orig_rizone/master' into RC2_DEV 2020-03-19 20:07:25 +01:00
Pairi Daiza
6a7ecd2ab8
Merge pull request #2137 from hpwamr/mui
MUI - Minor translation for "Italian" language.
2020-03-19 19:55:09 +01:00
Pairi Daiza
2e845f177c MUI - Minor translation for "Italian" language. 2020-03-19 19:40:11 +01:00
RaiKoHoff
673f0f63b8 + rfc: get application directory refactoring 2020-03-19 17:30:55 +01:00
RaiKoHoff
19be3048c3 Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-19 15:42:54 +01:00
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
RaiKoHoff
98662071ba Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-19 08:52:10 +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
RaiKoHoff
9b475c472b Merge remote-tracking branch 'upstream/master' into RC2_DEV 2020-03-18 10:09:43 +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