OSDN Git Service
Takashi Sawanaka [Tue, 27 Dec 2022 13:23:11 +0000 (22:23 +0900)]
Update ChangeLogJapanese.*
Takashi Sawanaka [Tue, 27 Dec 2022 12:39:21 +0000 (21:39 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
# Conflicts:
# SetVersion.cmd
# Version.h
YIN, Gang [Tue, 27 Dec 2022 12:28:23 +0000 (20:28 +0800)]
update zh-cn translations (#1635)
* unify the translations of Filter
* update zh-cn translations
Takashi Sawanaka [Mon, 26 Dec 2022 22:42:17 +0000 (07:42 +0900)]
Bump revision to 2.16.25
Takashi Sawanaka [Mon, 26 Dec 2022 22:40:35 +0000 (07:40 +0900)]
Update ChangeLog&ReleaseNotes (6)
Takashi Sawanaka [Mon, 26 Dec 2022 22:40:09 +0000 (07:40 +0900)]
Update TranslationsStatus
Mr-Update [Mon, 26 Dec 2022 22:35:28 +0000 (23:35 +0100)]
Update German.po (#1633)
Tichij [Mon, 26 Dec 2022 14:21:21 +0000 (16:21 +0200)]
Update of Lithuanian translation (#1632)
efi99 [Mon, 26 Dec 2022 14:20:25 +0000 (15:20 +0100)]
Update Hungarian.po (#1631)
Takashi Sawanaka [Sun, 25 Dec 2022 23:12:36 +0000 (08:12 +0900)]
Update ChangeLog&ReleaseNotes (5)
Takashi Sawanaka [Sun, 25 Dec 2022 23:12:11 +0000 (08:12 +0900)]
Update TranslationsStatus
Marcello-mco [Sun, 25 Dec 2022 23:03:07 +0000 (20:03 -0300)]
[xml] Update brazilian.po (#1630)
Translation for " Add auto-reload modified files option (#1611)"
Patriccollu [Sun, 25 Dec 2022 23:01:26 +0000 (00:01 +0100)]
Update Corsican translation for 2.16.25 (2nd) (#1629)
Takashi Sawanaka [Sun, 25 Dec 2022 12:31:39 +0000 (21:31 +0900)]
Update ChangeLog&ReleaseNotes (4)
Takashi Sawanaka [Sun, 25 Dec 2022 12:23:16 +0000 (21:23 +0900)]
Add auto-reload modified files option (#1611)
* Add DirWatcher.*
* WIP (2)
* WIP(2)
* WIP(3)
* WIP(4)
Takashi Sawanaka [Sat, 24 Dec 2022 14:01:13 +0000 (23:01 +0900)]
Update ChangeLog&ReleaseNotes (3)
Takashi Sawanaka [Sat, 24 Dec 2022 13:57:55 +0000 (22:57 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Patriccollu [Sat, 24 Dec 2022 13:57:07 +0000 (14:57 +0100)]
Update Corsican translation for 2.16.25 (#1628)
Takashi Sawanaka [Sat, 24 Dec 2022 05:07:52 +0000 (14:07 +0900)]
Update ChangeLog&ReleaseNotes (2)
Takashi Sawanaka [Tue, 20 Dec 2022 23:08:34 +0000 (08:08 +0900)]
Update ChangeLog&ReleaseNotes
Takashi Sawanaka [Tue, 20 Dec 2022 23:08:10 +0000 (08:08 +0900)]
Update Slovenian translation. Submitted by JadranR
Tichij [Tue, 20 Dec 2022 15:10:55 +0000 (17:10 +0200)]
Update of Lithuanian translation (#1621)
efi99 [Mon, 19 Dec 2022 13:11:22 +0000 (14:11 +0100)]
Update Hungarian.po (#1618)
Marcello-mco [Sun, 18 Dec 2022 23:15:39 +0000 (20:15 -0300)]
Update Brazilian.po (#1617)
Translate "Copy All Displayed Columns" to the context menu of the folder compare view.
Mr-Update [Sun, 18 Dec 2022 23:14:44 +0000 (00:14 +0100)]
Update German.po (#1616)
Jun Tajima [Sun, 18 Dec 2022 12:58:41 +0000 (21:58 +0900)]
Add "Copy All Displayed Columns" to the context menu of the folder compare window. (#1615)
- Copy the string of all displayed columns of selected items to the clipboard.
Takashi Sawanaka [Sat, 17 Dec 2022 13:14:42 +0000 (22:14 +0900)]
Update TranslationsStatus
Takashi Sawanaka [Sat, 17 Dec 2022 13:14:10 +0000 (22:14 +0900)]
Update Contributors.txt
YIN, Gang [Sat, 17 Dec 2022 13:10:24 +0000 (21:10 +0800)]
unify the translations of Filter (#1614)
Takashi Sawanaka [Wed, 14 Dec 2022 23:21:00 +0000 (08:21 +0900)]
FilpathEdit.cpp, EditorFilepathBar.cpp: Fix for High DPI
Takashi Sawanaka [Sun, 11 Dec 2022 12:31:45 +0000 (21:31 +0900)]
Fix issue #1598: Starting Pane Consistency
Takashi Sawanaka [Mon, 5 Dec 2022 15:22:52 +0000 (00:22 +0900)]
FilpathEdit.cpp: Lighten the color of the header bar a bit
Takashi Sawanaka [Sun, 4 Dec 2022 13:57:58 +0000 (22:57 +0900)]
refactor
Takashi Sawanaka [Sun, 4 Dec 2022 13:00:05 +0000 (22:00 +0900)]
BCMenu.cpp: Fix incorrect height/width of menu items on High DPI
Takashi Sawanaka [Sun, 4 Dec 2022 10:27:02 +0000 (19:27 +0900)]
Use __super
Jun Tajima [Sun, 4 Dec 2022 10:22:23 +0000 (19:22 +0900)]
Add a feature for debugging. (#1595)
- Defining SHOW_DIFFITEM_DEBUG_INFO in src/DiffItem.h adds DiffItem debug information to the "Display Columns" dialog.
Display debug information for DiffItems in the folder compare window by selecting the added debug information in this dialog.
pgert [Fri, 2 Dec 2022 23:43:23 +0000 (00:43 +0100)]
Update & Improvements to Swedish Translation (#1594)
Takashi Sawanaka [Tue, 29 Nov 2022 14:41:49 +0000 (23:41 +0900)]
Fix issue #1588: File Duplication Bug In Outputted Zips (2)
Takashi Sawanaka [Tue, 29 Nov 2022 14:29:38 +0000 (23:29 +0900)]
FolderCompare: Fix crash when pressing Shift+F10 to show the context menu when there is no focused item
Takashi Sawanaka [Tue, 29 Nov 2022 14:25:51 +0000 (23:25 +0900)]
Fix issue #1583 Syntax highlighting for SQL leaves many things out. (#1591) (2) Change sort order when keywords are converted to lower case
stonee-K [Tue, 29 Nov 2022 14:10:27 +0000 (23:10 +0900)]
Fix issue #1583 Syntax highlighting for SQL leaves many things out. (#1591)
* Add SQL:2016 keywords to crystaledit
* This keyword list does not contain non-standard keywords (GO, DUAL...)
reference:
https://en.wikipedia.org/wiki/List_of_SQL_reserved_words
Takashi Sawanaka [Sun, 27 Nov 2022 13:24:23 +0000 (22:24 +0900)]
Bump revision to 2.16.24+-jp-2
Takashi Sawanaka [Sun, 27 Nov 2022 13:20:58 +0000 (22:20 +0900)]
Update ChangeLogJapanese (2)
Takashi Sawanaka [Sun, 27 Nov 2022 12:27:02 +0000 (21:27 +0900)]
Merge remote-tracking branch 'upstream/master' into jp
Takashi Sawanaka [Sun, 27 Nov 2022 12:11:45 +0000 (21:11 +0900)]
Fix issue #1588: File Duplication Bug In Outputted Zips
Takashi Sawanaka [Sat, 26 Nov 2022 13:35:48 +0000 (22:35 +0900)]
Update markdown.cpp (#1590) (2)
Takashi Sawanaka [Sat, 26 Nov 2022 13:01:47 +0000 (22:01 +0900)]
unicoder.cpp light performance improvements (#1586) (2)
Yurii Hordiienko [Sat, 26 Nov 2022 12:58:10 +0000 (07:58 -0500)]
Update markdown.cpp (#1590)
Missing set to nullptr added
Yurii Hordiienko [Fri, 25 Nov 2022 13:31:06 +0000 (08:31 -0500)]
unicoder.cpp light performance improvements (#1586)
* Update unicoder.cpp
CheckForInvalidUtf8 performance improvement
* unicoder.cpp
light performance improvements
* Update unicoder.cpp
space-tab change
Yurii Hordiienko [Thu, 24 Nov 2022 13:51:40 +0000 (08:51 -0500)]
Update unicoder.cpp (#1584)
CheckForInvalidUtf8 performance improvement
Takashi Sawanaka [Wed, 23 Nov 2022 13:37:37 +0000 (22:37 +0900)]
Update ChangeLogJapanese
Takashi Sawanaka [Wed, 23 Nov 2022 12:23:44 +0000 (21:23 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Wed, 23 Nov 2022 12:22:47 +0000 (21:22 +0900)]
Fix issue #1575: WinMerge hangs for a certain regex search & replace action for clearing all lines not containing '%' (2)
Takashi Sawanaka [Wed, 23 Nov 2022 10:44:52 +0000 (19:44 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Wed, 23 Nov 2022 02:26:27 +0000 (11:26 +0900)]
osdn#46082: Fix incorrect links to files with # in filename in folder comparison report
Yurii Hordiienko [Tue, 22 Nov 2022 15:13:12 +0000 (10:13 -0500)]
CheckForInvalidUtf8 performance improvement; code cleanup (#1582)
* CheckForInvalidUtf8 performance improvement; code cleanup
* Update unicoder.cpp
cleanup
* Update unicoder.cpp
CheckForInvalidUtf8: fixed unexpected memcpy call (intrinsic not used)
Takashi Sawanaka [Mon, 21 Nov 2022 13:31:26 +0000 (22:31 +0900)]
Update Galician.po. Submitted by P0rsche-911
Takashi Sawanaka [Sun, 20 Nov 2022 00:24:06 +0000 (09:24 +0900)]
Fixed incorrectly SubEditList ReadOnly attribute storage; refactoring (#1580) (2)
Yurii Hordiienko [Sun, 20 Nov 2022 00:19:21 +0000 (19:19 -0500)]
Fixed incorrectly SubEditList ReadOnly attribute storage; refactoring (#1580)
Originally SubEditList uses std::set<bool> m_readOnlyColumns storage for read-only columns.
Expectedly int-type should be used instead of bool-type if we want to make any particular (not only 0-index) column work in read-only mode or it doesn't have any sense to use std::set at all. Original code doesn't produce any issue because that function used in one place (I hope) with index 0 only, respectively 0-column only read-only and any other does not.
Code refactored to eliminate usage of 2 redundant std::set storages for 2 different attributes and used one only std::vector to store and read_only+boolean_value type and EditStyle.
Takashi Sawanaka [Sat, 19 Nov 2022 14:23:14 +0000 (23:23 +0900)]
Fix issue #1575: WinMerge hangs for a certain regex search & replace action for clearing all lines not containing '%'
Yurii Hordiienko [Sat, 19 Nov 2022 12:05:51 +0000 (07:05 -0500)]
DiffFileData optimization for same-files (#1579)
* light optimization
- diffFileData same-files optimization;
- light code generation improvement;
* Add files via upload
* Delete CompareStats.cpp
* Add files via upload
Takashi Sawanaka [Fri, 18 Nov 2022 13:10:10 +0000 (22:10 +0900)]
Diff3.h: refactor (::at to ::operator[]) replacement, light cleanup (2)
stonee-K [Fri, 18 Nov 2022 12:59:02 +0000 (21:59 +0900)]
Fix: Mismatch between keyword list and comments (#1578)
Yurii Hordiienko [Fri, 18 Nov 2022 12:58:15 +0000 (07:58 -0500)]
Add files via upload (#1577)
refactor (::at to ::operator[]) replacement, light cleanup
Takashi Sawanaka [Thu, 17 Nov 2022 14:44:21 +0000 (23:44 +0900)]
Fields rearranged for size optimization (#1576) (2)
Yurii Hordiienko [Thu, 17 Nov 2022 14:24:16 +0000 (09:24 -0500)]
Fields rearranged for size optimization (#1576)
Takashi Sawanaka [Wed, 16 Nov 2022 23:24:45 +0000 (08:24 +0900)]
Update Contributors.txt
Takashi Sawanaka [Wed, 16 Nov 2022 23:24:27 +0000 (08:24 +0900)]
ccrystaltextview.cpp: GNU Bracing Style
Yurii Hordiienko [Wed, 16 Nov 2022 23:14:17 +0000 (18:14 -0500)]
Preliminary exit (performance optimization) for Scrollbars calculation (#1574)
* Add files via upload
optimized scrollbar calculation for big files
* Update ccrystaltextview.cpp
build error due wrong prev change
Takashi Sawanaka [Wed, 16 Nov 2022 14:56:13 +0000 (23:56 +0900)]
Update README.md
stonee-K [Wed, 16 Nov 2022 14:40:07 +0000 (23:40 +0900)]
* Add css keywords to crystaledit (#1572)
* User 1 text color --> css1, css2.1, css3 keywords (standard)
* User 2 text color --> experimental or deprecated keywords
* Remove unknown keywords (ascent, bbox, ...)
reference:
https://developer.mozilla.org/en-US/docs/Web/CSS/Reference
Takashi Sawanaka [Tue, 15 Nov 2022 14:28:26 +0000 (23:28 +0900)]
Installer:
- Rename Chinese_Simplified to ChineseSimplified
- Rename Chinese_Traditional to ChineseTraditional
Takashi Sawanaka [Sun, 13 Nov 2022 14:02:09 +0000 (23:02 +0900)]
Remove unused static variables
Takashi Sawanaka [Sun, 13 Nov 2022 13:52:10 +0000 (22:52 +0900)]
Remove unused static functions
Takashi Sawanaka [Sun, 13 Nov 2022 13:19:13 +0000 (22:19 +0900)]
Remove unused local variables
Jun Tajima [Sun, 13 Nov 2022 06:48:54 +0000 (15:48 +0900)]
Fix the problem that WinMerge crashes when pressing the "OK" button in the "Display Columns" dialog in the debug version. (#1568)
- Disable the "OK" button in the "Display Columns" dialog if no items are checked.
- Reload the columns in the folder compare window when the "OK" button in the "Display Columns" dialog is pressed with no items checked
(although it cannot actually be pressed due to the fix above).
- Add some error handling and asserts.
Takashi Sawanaka [Sat, 12 Nov 2022 15:15:36 +0000 (00:15 +0900)]
Options dialog (Compare/Folder category): Fix the problem that "Number of CPU cores to use" textbox is not disabled on initial display when Compare method is other than "Full Contents" or "Quick Contents"
Takashi Sawanaka [Sat, 12 Nov 2022 14:17:58 +0000 (23:17 +0900)]
Folder Compare:
- Fix osdn.net #46061: Fix problem with scrolling to unexpected position when expanding folders
- Fix the problem of moving the selection when a folder is expanded
Mirosław Żylewicz [Sat, 12 Nov 2022 00:03:08 +0000 (01:03 +0100)]
Update Polish.po (#1566)
Takashi Sawanaka [Fri, 11 Nov 2022 15:54:47 +0000 (00:54 +0900)]
Update Turkish.po
stonee-K [Fri, 11 Nov 2022 15:49:07 +0000 (00:49 +0900)]
Add html5 keywords to crystaledit (#1565)
Kaya Zeren [Thu, 10 Nov 2022 14:35:30 +0000 (17:35 +0300)]
Turkish translation update 2.16.24.0 (#1563)
Turkish translation update 2.16.24.0
Takashi Sawanaka [Sun, 6 Nov 2022 13:04:08 +0000 (22:04 +0900)]
Attempt to fix issue #1558 "Crash when copying files/folders"
Takashi Sawanaka [Sun, 6 Nov 2022 07:26:28 +0000 (16:26 +0900)]
Binary compare: Allow 64bit versions to open files larger than 2GB. (#1549)
Takashi Sawanaka [Sun, 6 Nov 2022 05:17:01 +0000 (14:17 +0900)]
Update Russian.po
Takashi Sawanaka [Sat, 5 Nov 2022 05:47:20 +0000 (14:47 +0900)]
Fix issue #1556: Selection in "Replace" by regular expression doesn't work with \n
Takashi Sawanaka [Fri, 4 Nov 2022 13:59:49 +0000 (22:59 +0900)]
Fix the problem that the "According to WinMerge User Interface" option in the Codepage category of the Options dialog would always result in the codepage being 1252.
Takashi Sawanaka [Tue, 1 Nov 2022 23:09:59 +0000 (08:09 +0900)]
Update Contributors.txt
Takashi Sawanaka [Tue, 1 Nov 2022 23:08:50 +0000 (08:08 +0900)]
ReadMe-Russian.txt: Change the file encoding from UTF-8 to CP-1251
Den1704 [Tue, 1 Nov 2022 23:05:26 +0000 (02:05 +0300)]
Update ReadMe-Russian.txt (#1555)
Den1704 [Tue, 1 Nov 2022 23:04:43 +0000 (02:04 +0300)]
Update Russian.po (#1554)
Den1704 [Tue, 1 Nov 2022 23:03:44 +0000 (02:03 +0300)]
Update Russian.po (#1553)
Takashi Sawanaka [Mon, 31 Oct 2022 14:49:58 +0000 (23:49 +0900)]
Installer: Run powershell.exe with full path. issue #1548
Jun Tajima [Sat, 29 Oct 2022 14:52:58 +0000 (23:52 +0900)]
Add processing to indicate that two files are identical in the "Comparison result" column when one file does not exist and the other two files are identical in a 3-way folder comparison. (#1545)
pea-sys [Sat, 29 Oct 2022 13:30:02 +0000 (22:30 +0900)]
png optimization (#1541)
Takashi Sawanaka [Sat, 29 Oct 2022 04:53:40 +0000 (13:53 +0900)]
Get codepage list asynchronously, because the Codepage dialog appears slow.
Takashi Sawanaka [Wed, 26 Oct 2022 14:50:42 +0000 (23:50 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Wed, 26 Oct 2022 14:49:56 +0000 (23:49 +0900)]
Update manual
Takashi Sawanaka [Wed, 26 Oct 2022 14:19:56 +0000 (23:19 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
Takashi Sawanaka [Wed, 26 Oct 2022 14:16:51 +0000 (23:16 +0900)]
Update ChangeLog&ReleaseNotes (3)