Commit Graph

2936 Commits

Author SHA1 Message Date
Rainer Kottenhoff
2aa59d615e + chg: code cleanup 2019-03-21 12:02:01 +01:00
Rainer Kottenhoff
aa0c4a33b5
Merge pull request #1073 from RaiKoHoff/Dev_UCHARDET
Update VS2019 Prev compiler tool-set update
2019-03-21 00:31:00 +01:00
Rainer Kottenhoff
2902d6299a + upd: VS2019 compiler toolset update 2019-03-21 00:15:29 +01:00
Rainer Kottenhoff
82b5ed8679
Merge pull request #1072 from RaiKoHoff/Dev_UCHARDET
Minor Fixes
2019-03-20 23:56:38 +01:00
Rainer Kottenhoff
049475907d + fix: Language dependency for default and standard Theme menu items 2019-03-20 23:41:46 +01:00
Rainer Kottenhoff
20b21371a9 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_UCHARDET 2019-03-20 23:23:01 +01:00
Pairi Daiza
8a3e4fa9d7
Merge pull request #1071 from hpwamr/MUI_dev
MUI - Italian translation, minor corrections in Menu, dialogs and str…
2019-03-20 17:36:41 +01:00
Pairi Daiza
866055d2c7 MUI - Italian translation, minor corrections in Menu, dialogs and strings 2019-03-20 17:23:27 +01:00
Rainer Kottenhoff
0d29e19c40 + upd: Scintilla current GitHub mirror
+ fix: Encoding detection Framework
2019-03-20 11:32:05 +01:00
Pairi Daiza
dd5682a5da
Merge pull request #1070 from hpwamr/MUI_dev
MUI - Translation in Italian (it-IT) of Notepad3 (Final)
2019-03-19 19:39:51 +01:00
Pairi Daiza
fe23680971 MUI - Translation in Italian (it-IT) of Notepad3 (Final) 2019-03-19 19:38:47 +01:00
Pairi Daiza
e777f60b58
Merge pull request #1069 from hpwamr/MUI_dev
MUI - Translation in Italian (it-IT) of Notepad3 (Partial_4)
2019-03-19 17:14:00 +01:00
Pairi Daiza
2fc52d34ca MUI - Translation in Italian (it-IT) of Notepad3 (Partial_4) 2019-03-19 16:51:08 +01:00
Pairi Daiza
b3aaba11e4
Merge pull request #1068 from hpwamr/MUI_dev
MUI - Translation in Italian (it-IT) of Notepad3 (Partial_3)
2019-03-19 15:08:57 +01:00
Pairi Daiza
e00f50ebad MUI - Translation in Italian (it-IT) of Notepad3 (Partial_3) 2019-03-19 14:44:36 +01:00
Pairi Daiza
ab70b97400
Merge pull request #1067 from hpwamr/MUI_dev
MUI - Translation in Italian (it-IT) of Notepad3 (Partial_3)
2019-03-19 13:49:47 +01:00
Pairi Daiza
871710970d MUI - Translation in Italian (it-IT) of Notepad3 (Partial_3) 2019-03-19 13:31:46 +01:00
Pairi Daiza
b0f99deb21
Merge pull request #1066 from hpwamr/MUI_dev
MUI - Translation in Italian (it-IT) of Notepad3 (Partial_2 )
2019-03-18 19:02:30 +01:00
Pairi Daiza
a495679f88 MUI - Translation in Italian (it-IT) of Notepad3 (Partial_2 ) 2019-03-18 18:25:02 +01:00
Rainer Kottenhoff
00028613e2
Merge pull request #1065 from RaiKoHoff/Dev_UCHARDET
Small corrections for settings default change comparison
2019-03-18 17:51:49 +01:00
Rainer Kottenhoff
cc1a3d7809 Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_UCHARDET 2019-03-18 17:24:59 +01:00
Rainer Kottenhoff
6017ae1a63 +fix: small corrections for settings change detection 2019-03-18 17:23:29 +01:00
Pairi Daiza
10ef7dc0f3
Merge pull request #1064 from hpwamr/MUI_dev
MUI - Prepare for  Polish  language [pl-PL] (final)
2019-03-18 17:20:04 +01:00
Pairi Daiza
17c4b4c444 MUI - Prepare for Polish language [pl-PL] (final) 2019-03-18 17:07:53 +01:00
Rainer Kottenhoff
7bfe1a29d3
Merge pull request #1063 from RaiKoHoff/Dev_UCHARDET
Remember last used theme (if save settings is enabled)
2019-03-18 16:13:54 +01:00
Rainer Kottenhoff
04e75bb6e0 + add: remember last used theme (if save settings is enabled) 2019-03-18 16:01:34 +01:00
Rainer Kottenhoff
eb1a2ddbc4 Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_UCHARDET 2019-03-18 13:43:04 +01:00
Rainer Kottenhoff
b1face37e4 + cln: minor code cleanup 2019-03-18 13:42:44 +01:00
Pairi Daiza
4bca13f6ff
Merge pull request #1062 from hpwamr/MUI_dev
Fine tune cause the *.ini files are copied by "build script"
2019-03-18 12:54:00 +01:00
Pairi Daiza
a84108476a Fine tune cause the *.ini files are copied by "build script" 2019-03-18 12:41:05 +01:00
Rainer Kottenhoff
ab7b413968 Merge remote-tracking branch 'Notepad3_upstream_Rizone/master' into Dev_UCHARDET 2019-03-18 12:20:13 +01:00
Pairi Daiza
ad1c574d59
Merge pull request #1061 from hpwamr/MUI_dev
Mui dev - Remove files that are copied by "build script"
2019-03-18 12:19:36 +01:00
Pairi Daiza
f6d2fdef72 Add directory "settings" to the list .GitIgnore list
- Cause the *.ini files and Themes are copied by "build script"
2019-03-18 12:02:14 +01:00
Pairi Daiza
133d0a2592 Add directory "settings" to the list .GitIgnore list
- Cause the *.ini files and Themes are copied by "build script"
2019-03-18 11:51:10 +01:00
Pairi Daiza
d0098ef96a
Delete minipath.ini 2019-03-18 11:22:12 +01:00
Pairi Daiza
254a5d6e73
Delete Notepad3.ini 2019-03-18 11:22:00 +01:00
Rainer Kottenhoff
ed91513fc1 + upd: uthash macros 2019-03-18 00:02:44 +01:00
Rainer Kottenhoff
f30c469a17
Merge pull request #1057 from RaiKoHoff/Dev_UCHARDET
Polish Language templates (cloned from en-GB)
2019-03-17 23:53:21 +01:00
Rainer Kottenhoff
3b8fc25687 + add: Polish language resources template (en-GB) 2019-03-17 23:42:44 +01:00
Rainer Kottenhoff
405de95041 + fix: merged language file 2019-03-17 22:58:55 +01:00
Rainer Kottenhoff
0e4475ade1 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_UCHARDET
# Conflicts:
#	language/np3_es_es/strings_es_es.rc
#	themes/style_schemata/Dark Theme.ini
#	themes/style_schemata/dark_theme_2nd_default_text.ini
#	themes/style_schemata/dark_theme_default_text.ini
2019-03-17 22:56:17 +01:00
Rainer Kottenhoff
0cab9d4698 fix: Hyperlink Styling for changed Themes 2019-03-17 19:59:09 +01:00
Pairi Daiza
4fcd33b5f6
Merge pull request #1056 from jczanfona/Typo_error
Typo error
2019-03-17 19:58:01 +01:00
josemaria_cr
ff5fc9143a Typo_error 2019-03-17 19:30:52 +01:00
Pairi Daiza
7fbb94f3ec
Merge pull request #1055 from hpwamr/MUI_dev
MUI - Prepare for  Polish  language [pl-PL] (partial)
2019-03-17 18:09:02 +01:00
Pairi Daiza
77bc416b6c MUI - Prepare for Polish language [pl-PL] (partial) 2019-03-17 17:44:08 +01:00
Rainer Kottenhoff
929e99001d Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_UCHARDET 2019-03-17 17:05:10 +01:00
Pairi Daiza
bf1c2e106d
Merge pull request #1053 from hpwamr/MUI_dev
MUI - Add Code-page tags '// encoding: cpxxx" (adjust.)
2019-03-16 19:15:56 +01:00
Pairi Daiza
f87aa08e84 MUI - Add Code-page tags '// encoding: cpxxx" (adjust.) 2019-03-16 18:36:53 +01:00
Pairi Daiza
465fca75e4
Merge pull request #1052 from hpwamr/MUI_dev
MUI - Add Code-page tags '// encoding: cpxxx" (adjust.)
2019-03-16 17:35:52 +01:00