OSDN Git Service
Takashi Sawanaka [Mon, 30 Nov 2020 23:53:41 +0000 (08:53 +0900)]
Merge.rc: Make the Default button (on the Compare/General page) non-resizable
Takashi Sawanaka [Mon, 30 Nov 2020 23:51:32 +0000 (08:51 +0900)]
Update Portuguese.po
Takashi Sawanaka [Mon, 30 Nov 2020 23:41:24 +0000 (08:41 +0900)]
Update Manual/JP
Mr-Update [Mon, 30 Nov 2020 23:30:51 +0000 (00:30 +0100)]
Update manual (#497)
* Update Compare_dirs.xml
* Update Install.xml
* Update Plugins.xml
* Update Shortcut_keys.xml
Tichij [Mon, 30 Nov 2020 13:42:40 +0000 (15:42 +0200)]
Update of Lithuanian translation (#496)
Takashi Sawanaka [Mon, 30 Nov 2020 13:41:17 +0000 (22:41 +0900)]
Fixed some untranslated strings
Takashi Sawanaka [Sun, 29 Nov 2020 23:05:05 +0000 (08:05 +0900)]
Update translations
Hugo Carvalho [Sun, 29 Nov 2020 22:51:47 +0000 (22:51 +0000)]
Add files via upload (#495)
Takashi Sawanaka [Sun, 29 Nov 2020 14:50:32 +0000 (23:50 +0900)]
Update translations
Takashi Sawanaka [Sun, 29 Nov 2020 14:09:44 +0000 (23:09 +0900)]
Fix GitHub issue #491: Winmerge crashes consistently when deleting files
Takashi Sawanaka [Sun, 29 Nov 2020 14:08:06 +0000 (23:08 +0900)]
Update Galician.po
wvxwxvw [Sun, 29 Nov 2020 08:44:39 +0000 (11:44 +0300)]
Update Russian.po (#494)
Takashi Sawanaka [Sun, 29 Nov 2020 05:53:34 +0000 (14:53 +0900)]
Update ChangeLog and ReleaseNotes
Takashi Sawanaka [Sun, 29 Nov 2020 05:37:04 +0000 (14:37 +0900)]
Update translations
LMS [Sun, 29 Nov 2020 01:18:40 +0000 (02:18 +0100)]
Galician translation update (#493)
Takashi Sawanaka [Sat, 28 Nov 2020 02:27:43 +0000 (11:27 +0900)]
Update translations
Takashi Sawanaka [Sat, 28 Nov 2020 02:17:42 +0000 (11:17 +0900)]
Update TranslationsStatus.*
Takashi Sawanaka [Sat, 28 Nov 2020 02:17:21 +0000 (11:17 +0900)]
Update Manual/JP
Mr-Update [Sat, 28 Nov 2020 01:28:28 +0000 (02:28 +0100)]
Update manual (#492)
* Update Compare_files.xml
* Update Configuration.xml
* Update Intro_diffs.xml
* Update Open_paths.xml
* Update Shortcut_keys.xml
* Update Version_control.xml
Takashi Sawanaka [Thu, 26 Nov 2020 23:39:25 +0000 (08:39 +0900)]
Update translations
Mr-Update [Wed, 25 Nov 2020 23:09:45 +0000 (00:09 +0100)]
Update German.po (#490)
Translation completed.
Takashi Sawanaka [Wed, 25 Nov 2020 12:41:01 +0000 (21:41 +0900)]
Update translations
Jadran [Tue, 24 Nov 2020 11:30:21 +0000 (12:30 +0100)]
Update Slovenian.po (#488)
Finishet updates 24.11.2020.
Best Regards,
Jadran
Mr-Update [Tue, 24 Nov 2020 09:52:31 +0000 (10:52 +0100)]
Update Merge.rc (#487)
- Typos corrected
- Hotkeys added
Jadran [Mon, 23 Nov 2020 22:25:44 +0000 (23:25 +0100)]
Update Slovenian.po (#486)
Please, update Slovenian.po and allow Me that I can changing this file (and download).
With respect,
Jadran
Takashi Sawanaka [Sun, 22 Nov 2020 09:26:24 +0000 (18:26 +0900)]
Fix GitHub issue #342: Pausing comparing doesn't pause immediately (2)
Takashi Sawanaka [Sun, 22 Nov 2020 09:12:56 +0000 (18:12 +0900)]
Fix GitHub issue #342: Pausing comparing doesn't pause immediately
Takashi Sawanaka [Sun, 22 Nov 2020 05:47:19 +0000 (14:47 +0900)]
Update Japanese.po
Takashi Sawanaka [Sun, 22 Nov 2020 05:26:56 +0000 (14:26 +0900)]
Manual: Fix WinMerge2011 URL
Takashi Sawanaka [Sun, 22 Nov 2020 03:59:28 +0000 (12:59 +0900)]
Fix GitHub issue #483: Sorting on Comparison Result being done incorectly
Takashi Sawanaka [Sun, 22 Nov 2020 02:08:37 +0000 (11:08 +0900)]
Update translationsStatus
Takashi Sawanaka [Sun, 22 Nov 2020 02:08:24 +0000 (11:08 +0900)]
Update Manual/JP
Mr-Update [Sun, 22 Nov 2020 01:43:57 +0000 (02:43 +0100)]
Update manual (#485)
* Update About_Doc.xml
* Update Command_line.xml
* Update Compare_dirs.xml
* Update Compare_files.xml
* Update Configuration.xml
* Update Faq.xml
* Update Filters.xml
* Update Install.xml
* Update Intro_diffs.xml
* Update Introduction.xml
* Update Plugins.xml
* Update Quick_start.xml
Jun Tajima [Sun, 22 Nov 2020 01:43:15 +0000 (10:43 +0900)]
Add the feature "Go to Moved Line". (#484)
This feature can be performed in the file compare window in the following ways:
- The Context menu of the File pane or the Diff pane
- Shortcut key "Ctrl + Alt + G" or "Ctrl + Shift + G"
Takashi Sawanaka [Sat, 21 Nov 2020 06:20:00 +0000 (15:20 +0900)]
Fix GitHub issue #452: Automatically scroll to first difference (2)
Add "Automatically scroll to first inline difference" option to Options dialog
Takashi Sawanaka [Wed, 18 Nov 2020 00:08:44 +0000 (09:08 +0900)]
Update Japanese.po
Takashi Sawanaka [Tue, 17 Nov 2020 10:57:00 +0000 (19:57 +0900)]
Update translations
Takashi Sawanaka [Tue, 17 Nov 2020 10:56:42 +0000 (19:56 +0900)]
Update Japanese translation
Takashi Sawanaka [Mon, 16 Nov 2020 22:58:39 +0000 (07:58 +0900)]
stringdiffs.cpp: Make stringdiffs::onp() function faster
Takashi Sawanaka [Mon, 16 Nov 2020 22:49:34 +0000 (07:49 +0900)]
Update TranslationsStatus.*
Thomas De Rocker [Mon, 16 Nov 2020 22:45:47 +0000 (23:45 +0100)]
Update Dutch.po (#482)
Tichij [Mon, 16 Nov 2020 22:45:20 +0000 (00:45 +0200)]
Update of Lithuanian translations (#481)
* Update of Lithuanian translations
* Aligning of Russian translation with resource changes
Mr-Update [Sun, 15 Nov 2020 23:44:54 +0000 (00:44 +0100)]
Update German.po (#480)
Translation completed
Tim Gerundt [Sun, 15 Nov 2020 21:39:21 +0000 (22:39 +0100)]
Add colors to translation status
Takashi Sawanaka [Sun, 15 Nov 2020 11:01:36 +0000 (20:01 +0900)]
crystaledit/test: Add htmlTests.cpp
Takashi Sawanaka [Sun, 15 Nov 2020 10:37:22 +0000 (19:37 +0900)]
crystallineparser.h: Merge TEXTBLOCK if the color is the same as the previous TEXTBLOCK
Takashi Sawanaka [Sun, 15 Nov 2020 04:37:33 +0000 (13:37 +0900)]
crystaledit/test: Add batchTests.cpp
Takashi Sawanaka [Sun, 15 Nov 2020 04:31:24 +0000 (13:31 +0900)]
editlib/parsers/batch.cpp: TEXT ... ENDTEXT block is not standard batch commands
Takashi Sawanaka [Sun, 15 Nov 2020 03:47:50 +0000 (12:47 +0900)]
verilog.cpp: Remove ccrystaltextview dependency
Takashi Sawanaka [Sun, 15 Nov 2020 02:01:04 +0000 (11:01 +0900)]
Merge.rc: Rename the checkbox "Filter Comments" to "Ignore comment differences"
Jun Tajima [Sat, 14 Nov 2020 22:20:09 +0000 (07:20 +0900)]
Fix the problem that "Goto...", "Goto Line <line>" and moving by left click on the Location pane do not work appropriately when the Diff pane is active in the file compare window. (#476)
Activates the File pane and go to the specified line if the above operation is performed when the Diff pane is active.
Takashi Sawanaka [Sat, 14 Nov 2020 14:44:30 +0000 (23:44 +0900)]
Fix GitHub issue #403: [UI] Pane enlargement was reset after changing tab
Takashi Sawanaka [Sat, 14 Nov 2020 10:56:59 +0000 (19:56 +0900)]
Fix GitHub issue #456: Scrolling binary files
Takashi Sawanaka [Fri, 13 Nov 2020 12:58:16 +0000 (21:58 +0900)]
Update README.md
Takashi Sawanaka [Fri, 13 Nov 2020 12:18:20 +0000 (21:18 +0900)]
Installer: Display the contents of Readme-Lithuanian.txt at the end of the install wizard when the language is Lithuanian,
Takashi Sawanaka [Fri, 13 Nov 2020 12:13:46 +0000 (21:13 +0900)]
Update Slovenian.po
Takashi Sawanaka [Thu, 12 Nov 2020 23:57:15 +0000 (08:57 +0900)]
Update README.md
Takashi Sawanaka [Thu, 12 Nov 2020 23:54:25 +0000 (08:54 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Thu, 12 Nov 2020 23:53:24 +0000 (08:53 +0900)]
Add TranslationStatus.*
Ikko Ashimine [Thu, 12 Nov 2020 22:57:28 +0000 (07:57 +0900)]
Fix typo in memdc.h (#474)
relevent -> relevant
Takashi Sawanaka [Wed, 11 Nov 2020 21:07:30 +0000 (06:07 +0900)]
Manual: IgnoreSectionMarkers.ini is no longer used because it has been changed to a syntax highlighting based comment filter. (2)
Takashi Sawanaka [Wed, 11 Nov 2020 14:43:31 +0000 (23:43 +0900)]
Manual: IgnoreSectionMarkers.ini is no longer used because it has been changed to a syntax highlighting based comment filter.
Takashi Sawanaka [Wed, 11 Nov 2020 14:38:32 +0000 (23:38 +0900)]
Update ReadMe-Slovenian.txt
Ikko Ashimine [Mon, 9 Nov 2020 23:09:46 +0000 (08:09 +0900)]
Fix typo in GhostTextBuffer.cpp (#472)
preceeding -> preceding
Takashi Sawanaka [Mon, 9 Nov 2020 13:17:19 +0000 (22:17 +0900)]
Update ReadMe-Slovenian.txt. Submitted by JadranR (issue #285)
Takashi Sawanaka [Sun, 8 Nov 2020 23:23:11 +0000 (08:23 +0900)]
Update Slovenian.po. Submitted by JadranR (issue #285)
Takashi Sawanaka [Sun, 8 Nov 2020 10:59:22 +0000 (19:59 +0900)]
CrystalEdit/parsers: Remove unused variables
Takashi Sawanaka [Sun, 8 Nov 2020 10:41:55 +0000 (19:41 +0900)]
CrystalEdit: Prevent comment blocks (<!-- -->) inside <style>...</style> and <script>...</script> tags from being interpreted as comments (3)
Takashi Sawanaka [Sat, 7 Nov 2020 15:27:06 +0000 (00:27 +0900)]
CrystalEdit: Prevent comment blocks (<!-- -->) inside <style>...</style> and <script>...</script> tags from being interpreted as comments (2)
Takashi Sawanaka [Sat, 7 Nov 2020 14:48:11 +0000 (23:48 +0900)]
CrystalEdit: Prevent comment blocks (<!-- -->) inside <style>...</style> and <script>...</script> tags from being interpreted as comments
Takashi Sawanaka [Fri, 6 Nov 2020 14:33:18 +0000 (23:33 +0900)]
CrystalEdit: innosetup.cpp: Don't treat {constant} or // as comments except in the [Code] section
Takashi Sawanaka [Thu, 5 Nov 2020 12:17:58 +0000 (21:17 +0900)]
Installer: Add ReadMe-Slovak.txt
Takashi Sawanaka [Thu, 5 Nov 2020 12:00:05 +0000 (21:00 +0900)]
ReadMe-Slovak.txt: Change the file encoding from UTF-8 to CP-1250
Takashi Sawanaka [Thu, 5 Nov 2020 11:55:51 +0000 (20:55 +0900)]
Update Slovak.po
Takashi Sawanaka [Thu, 5 Nov 2020 11:51:00 +0000 (20:51 +0900)]
Rename the new file slovak.po to Slovak.po and delete slovak.po because the different case Slovak.po and slovak.po exist in the same folder.
jozefM [Thu, 5 Nov 2020 11:23:31 +0000 (12:23 +0100)]
update slovak translation (#470)
* update slovak translation
update slovak translation for WinMerge version 2.16.8
* update cotributors
updating contributor for slovak translation
* create slovak translation ReadMe
create file with slovak translation ReadMe
* Delete ReadMe-Slovak.txt
* Create ReadMe-Slovak.txt
create file ReadMe-slovak.txt
Takashi Sawanaka [Wed, 4 Nov 2020 13:00:34 +0000 (22:00 +0900)]
crystaledit/parses: Reduce Windows dependency
Takashi Sawanaka [Wed, 4 Nov 2020 12:00:48 +0000 (21:00 +0900)]
Update Contributors.txt
Takashi Sawanaka [Mon, 2 Nov 2020 14:44:05 +0000 (23:44 +0900)]
Fix GitHub issue #468: Editor text display is abnormal - character spacing problem
Takashi Sawanaka [Sun, 1 Nov 2020 23:11:01 +0000 (08:11 +0900)]
Fix a build error
Takashi Sawanaka [Sun, 1 Nov 2020 22:00:09 +0000 (07:00 +0900)]
Update Portuguese.po
Takashi Sawanaka [Sun, 1 Nov 2020 21:59:48 +0000 (06:59 +0900)]
Syntax-highlighter-based comment filter (Fix osdn.net ticket #40488) (#423) (2)
Takashi Sawanaka [Sun, 1 Nov 2020 14:33:04 +0000 (23:33 +0900)]
Syntax-highlighter-based comment filter (Fix osdn.net ticket #40488) (#423)
Hugo Carvalho [Mon, 26 Oct 2020 22:57:44 +0000 (22:57 +0000)]
Update Portuguese (#467)
Translation completed
Takashi Sawanaka [Mon, 26 Oct 2020 12:05:24 +0000 (21:05 +0900)]
Fix GitHub issue #466: Reloading file does not refresh its encoding
Takashi Sawanaka [Mon, 26 Oct 2020 00:17:10 +0000 (09:17 +0900)]
Update English.pot (2)
Takashi Sawanaka [Sun, 25 Oct 2020 23:55:19 +0000 (08:55 +0900)]
Fix GitHub issue #451: Winmerge Compare button disabled
Takashi Sawanaka [Sun, 25 Oct 2020 08:20:09 +0000 (17:20 +0900)]
Fix GitHub issue #395: Bug: Line Filters aren't applied when using a 3rd file
Fix GitHub issue #450: "Ignore blank lines" does not work in 3-way compare
Takashi Sawanaka [Sun, 25 Oct 2020 03:58:44 +0000 (12:58 +0900)]
Update ChineseSimplified.po
Takashi Sawanaka [Sun, 25 Oct 2020 03:58:30 +0000 (12:58 +0900)]
Fix some compilation warnings
Takashi Sawanaka [Sat, 24 Oct 2020 16:10:52 +0000 (01:10 +0900)]
Fix GitHub issue #452: Automatically scroll to first difference
Takashi Sawanaka [Sat, 24 Oct 2020 15:09:08 +0000 (00:09 +0900)]
MergeEditView: Add SetActivePane() function
YFdyh000 [Wed, 21 Oct 2020 21:59:54 +0000 (05:59 +0800)]
Update Chinese (Simplified) translations (#465)
Takashi Sawanaka [Sun, 18 Oct 2020 15:25:54 +0000 (00:25 +0900)]
OpenView.*: some refactoring
Takashi Sawanaka [Sun, 18 Oct 2020 14:10:28 +0000 (23:10 +0900)]
OpenView.*: some refactoring
Takashi Sawanaka [Sun, 18 Oct 2020 08:35:20 +0000 (17:35 +0900)]
Merge.rc: Change the error message
Takashi Sawanaka [Sun, 18 Oct 2020 06:42:16 +0000 (15:42 +0900)]
Fix compilation warnings
SamuelPlentz [Sun, 18 Oct 2020 06:38:58 +0000 (08:38 +0200)]
always copy "full line" instead of "selected text only" - option CopyFullLine (#459)
* CopyFullLine
* CopyFullLine
* CopyFullLine
* CopyFullLine
* CopyFullLine
* Revert - setting was added as compare setting by accident
* Revert - setting was added as compare setting by accident
* Change - setting was added as compare setting by accident
* Change - setting was added as compare setting by accident
* Revert - setting was added as compare setting by accident
* change - setting was added as compare setting by accident
* CopyFullLine
* CopyFullLine
Takashi Sawanaka [Sun, 18 Oct 2020 06:01:13 +0000 (15:01 +0900)]
Merge pull request #458 from qosobrin/master
Galician translation update
Takashi Sawanaka [Sun, 18 Oct 2020 06:00:26 +0000 (15:00 +0900)]
Merge pull request #457 from tjmprm77/feature/sync_point_after_last_block
Fix the problem accessing the text buffer out of range if a sync point is added by selecting a ghost line that is after the last block.