OSDN Git Service

winmerge-jp/winmerge-jp.git
3 years agoUpdate translations
Takashi Sawanaka [Sat, 12 Dec 2020 11:19:44 +0000 (20:19 +0900)]
Update translations

3 years agoMerge.rc: fine-tune
Takashi Sawanaka [Sat, 12 Dec 2020 10:56:42 +0000 (19:56 +0900)]
Merge.rc: fine-tune

3 years agoFixed processing that uses GetAsyncKeyState(). (#505)
Jun Tajima [Sat, 12 Dec 2020 10:44:23 +0000 (19:44 +0900)]
Fixed processing that uses GetAsyncKeyState(). (#505)

- Fixed the behaviour in the function CMainFrame::OnDropFiles() that when drag and drop is performed after pressing the control key,
  it behaves as if drag and drop is performed while pressing the control key.
- Fixed the behaviour in the function CImgMergeFrame::OnChildPaneEvent() that when an arrow key is pressed after pressing the shift key or control key,
  it behaves as if the arrow key is pressed while pressing the shift key or control key.

3 years agoFix GitHub issue #498: The Location pane doesn't draw a line connecting moved differe...
Takashi Sawanaka [Sat, 5 Dec 2020 13:17:15 +0000 (22:17 +0900)]
Fix GitHub issue #498: The Location pane doesn't draw a line connecting moved differences by default

3 years agoCppcheck: Found calculation inside sizeof().
Takashi Sawanaka [Sat, 5 Dec 2020 11:12:39 +0000 (20:12 +0900)]
Cppcheck: Found calculation inside sizeof().

3 years agoCppcheck: The function 'IsIndentableLine' overrides a function in a base class but...
Takashi Sawanaka [Sat, 5 Dec 2020 11:00:48 +0000 (20:00 +0900)]
Cppcheck: The function 'IsIndentableLine' overrides a function in a base class but is not marked with a 'override' specifier.

3 years agoCppcheck: Member variable 'PropCompareImage::m_bEnableImageCompare' is not initialize...
Takashi Sawanaka [Sat, 5 Dec 2020 10:52:11 +0000 (19:52 +0900)]
Cppcheck: Member variable 'PropCompareImage::m_bEnableImageCompare' is not initialized in the constructor.

3 years agoCppcheck: Variable '...' is assigned a value that is never used.
Takashi Sawanaka [Sat, 5 Dec 2020 10:32:47 +0000 (19:32 +0900)]
Cppcheck: Variable '...' is assigned a value that is never used.

3 years agoRemove unused function
Takashi Sawanaka [Sat, 5 Dec 2020 10:25:23 +0000 (19:25 +0900)]
Remove unused function

3 years agoFixed the message box "The report has been created successfully." is displayed even...
Takashi Sawanaka [Sat, 5 Dec 2020 09:07:44 +0000 (18:07 +0900)]
Fixed the message box "The report has been created successfully." is displayed even though the report creation failed.

3 years agoRevert "Change the default value of ConnectMovedBlocks from 0 to 1(All Moved Blocks...
Takashi Sawanaka [Wed, 2 Dec 2020 23:41:27 +0000 (08:41 +0900)]
Revert "Change the default value of ConnectMovedBlocks from 0 to 1(All Moved Blocks) (GitHub issue #498)"

This reverts commit 7a799406e2dff4acd9919d2c48ec5894e75964dd.

3 years agoChange the default value of ConnectMovedBlocks from 0 to 1(All Moved Blocks) (GitHub...
Takashi Sawanaka [Wed, 2 Dec 2020 22:59:32 +0000 (07:59 +0900)]
Change the default value of ConnectMovedBlocks from 0 to 1(All Moved Blocks) (GitHub issue #498)

3 years agoCase sensitive -> Ignore case
Takashi Sawanaka [Wed, 2 Dec 2020 00:24:25 +0000 (09:24 +0900)]
Case sensitive -> Ignore case

3 years agoUpdate translations
Takashi Sawanaka [Tue, 1 Dec 2020 23:17:14 +0000 (08:17 +0900)]
Update translations

3 years agoMerge.rc: Make the Default button (on the Compare/General page) non-resizable
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

3 years agoUpdate Portuguese.po
Takashi Sawanaka [Mon, 30 Nov 2020 23:51:32 +0000 (08:51 +0900)]
Update Portuguese.po

3 years agoUpdate Manual/JP
Takashi Sawanaka [Mon, 30 Nov 2020 23:41:24 +0000 (08:41 +0900)]
Update Manual/JP

3 years agoUpdate manual (#497)
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

3 years agoUpdate of Lithuanian translation (#496)
Tichij [Mon, 30 Nov 2020 13:42:40 +0000 (15:42 +0200)]
Update of Lithuanian translation (#496)

3 years agoFixed some untranslated strings
Takashi Sawanaka [Mon, 30 Nov 2020 13:41:17 +0000 (22:41 +0900)]
Fixed some untranslated strings

3 years agoUpdate translations
Takashi Sawanaka [Sun, 29 Nov 2020 23:05:05 +0000 (08:05 +0900)]
Update translations

3 years agoAdd files via upload (#495)
Hugo Carvalho [Sun, 29 Nov 2020 22:51:47 +0000 (22:51 +0000)]
Add files via upload (#495)

3 years agoUpdate translations
Takashi Sawanaka [Sun, 29 Nov 2020 14:50:32 +0000 (23:50 +0900)]
Update translations

3 years agoFix GitHub issue #491: Winmerge crashes consistently when deleting files
Takashi Sawanaka [Sun, 29 Nov 2020 14:09:44 +0000 (23:09 +0900)]
Fix GitHub issue #491: Winmerge crashes consistently when deleting files

3 years agoUpdate Galician.po
Takashi Sawanaka [Sun, 29 Nov 2020 14:08:06 +0000 (23:08 +0900)]
Update Galician.po

3 years agoUpdate Russian.po (#494)
wvxwxvw [Sun, 29 Nov 2020 08:44:39 +0000 (11:44 +0300)]
Update Russian.po (#494)

3 years agoUpdate ChangeLog and ReleaseNotes 2.16.9
Takashi Sawanaka [Sun, 29 Nov 2020 05:53:34 +0000 (14:53 +0900)]
Update ChangeLog and ReleaseNotes

3 years agoUpdate translations
Takashi Sawanaka [Sun, 29 Nov 2020 05:37:04 +0000 (14:37 +0900)]
Update translations

3 years agoGalician translation update (#493)
LMS [Sun, 29 Nov 2020 01:18:40 +0000 (02:18 +0100)]
Galician translation update (#493)

3 years agoUpdate translations
Takashi Sawanaka [Sat, 28 Nov 2020 02:27:43 +0000 (11:27 +0900)]
Update translations

3 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Sat, 28 Nov 2020 02:17:42 +0000 (11:17 +0900)]
Update TranslationsStatus.*

3 years agoUpdate Manual/JP
Takashi Sawanaka [Sat, 28 Nov 2020 02:17:21 +0000 (11:17 +0900)]
Update Manual/JP

3 years agoUpdate manual (#492)
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

3 years agoUpdate translations
Takashi Sawanaka [Thu, 26 Nov 2020 23:39:25 +0000 (08:39 +0900)]
Update translations

3 years agoUpdate German.po (#490)
Mr-Update [Wed, 25 Nov 2020 23:09:45 +0000 (00:09 +0100)]
Update German.po (#490)

Translation completed.

3 years agoUpdate translations
Takashi Sawanaka [Wed, 25 Nov 2020 12:41:01 +0000 (21:41 +0900)]
Update translations

3 years agoUpdate Slovenian.po (#488)
Jadran [Tue, 24 Nov 2020 11:30:21 +0000 (12:30 +0100)]
Update Slovenian.po (#488)

Finishet updates 24.11.2020.
Best Regards,
Jadran

3 years agoUpdate Merge.rc (#487)
Mr-Update [Tue, 24 Nov 2020 09:52:31 +0000 (10:52 +0100)]
Update Merge.rc (#487)

- Typos corrected
- Hotkeys added

3 years agoUpdate Slovenian.po (#486)
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

3 years agoFix GitHub issue #342: Pausing comparing doesn't pause immediately (2)
Takashi Sawanaka [Sun, 22 Nov 2020 09:26:24 +0000 (18:26 +0900)]
Fix GitHub issue #342: Pausing comparing doesn't pause immediately (2)

3 years agoFix GitHub issue #342: Pausing comparing doesn't pause immediately
Takashi Sawanaka [Sun, 22 Nov 2020 09:12:56 +0000 (18:12 +0900)]
Fix GitHub issue #342: Pausing comparing doesn't pause immediately

3 years agoUpdate Japanese.po
Takashi Sawanaka [Sun, 22 Nov 2020 05:47:19 +0000 (14:47 +0900)]
Update Japanese.po

3 years agoManual: Fix WinMerge2011 URL
Takashi Sawanaka [Sun, 22 Nov 2020 05:26:56 +0000 (14:26 +0900)]
Manual: Fix WinMerge2011 URL

3 years agoFix GitHub issue #483: Sorting on Comparison Result being done incorectly
Takashi Sawanaka [Sun, 22 Nov 2020 03:59:28 +0000 (12:59 +0900)]
Fix GitHub issue #483: Sorting on Comparison Result being done incorectly

3 years agoUpdate translationsStatus
Takashi Sawanaka [Sun, 22 Nov 2020 02:08:37 +0000 (11:08 +0900)]
Update translationsStatus

3 years agoUpdate Manual/JP
Takashi Sawanaka [Sun, 22 Nov 2020 02:08:24 +0000 (11:08 +0900)]
Update Manual/JP

3 years agoUpdate manual (#485)
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

3 years agoAdd the feature "Go to Moved Line". (#484)
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"

3 years agoFix GitHub issue #452: Automatically scroll to first difference (2)
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

3 years agoUpdate Japanese.po
Takashi Sawanaka [Wed, 18 Nov 2020 00:08:44 +0000 (09:08 +0900)]
Update Japanese.po

3 years agoUpdate translations
Takashi Sawanaka [Tue, 17 Nov 2020 10:57:00 +0000 (19:57 +0900)]
Update translations

3 years agoUpdate Japanese translation
Takashi Sawanaka [Tue, 17 Nov 2020 10:56:42 +0000 (19:56 +0900)]
Update Japanese translation

3 years agostringdiffs.cpp: Make stringdiffs::onp() function faster
Takashi Sawanaka [Mon, 16 Nov 2020 22:58:39 +0000 (07:58 +0900)]
stringdiffs.cpp: Make stringdiffs::onp() function faster

3 years agoUpdate TranslationsStatus.*
Takashi Sawanaka [Mon, 16 Nov 2020 22:49:34 +0000 (07:49 +0900)]
Update TranslationsStatus.*

3 years agoUpdate Dutch.po (#482)
Thomas De Rocker [Mon, 16 Nov 2020 22:45:47 +0000 (23:45 +0100)]
Update Dutch.po (#482)

3 years agoUpdate of Lithuanian translations (#481)
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

3 years agoUpdate German.po (#480)
Mr-Update [Sun, 15 Nov 2020 23:44:54 +0000 (00:44 +0100)]
Update German.po (#480)

Translation completed

3 years agoAdd colors to translation status
Tim Gerundt [Sun, 15 Nov 2020 21:39:21 +0000 (22:39 +0100)]
Add colors to translation status

3 years agocrystaledit/test: Add htmlTests.cpp
Takashi Sawanaka [Sun, 15 Nov 2020 11:01:36 +0000 (20:01 +0900)]
crystaledit/test: Add htmlTests.cpp

3 years agocrystallineparser.h: Merge TEXTBLOCK if the color is the same as the previous TEXTBLOCK
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

3 years agocrystaledit/test: Add batchTests.cpp
Takashi Sawanaka [Sun, 15 Nov 2020 04:37:33 +0000 (13:37 +0900)]
crystaledit/test: Add batchTests.cpp

3 years agoeditlib/parsers/batch.cpp: TEXT ... ENDTEXT block is not standard batch commands
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

3 years agoverilog.cpp: Remove ccrystaltextview dependency
Takashi Sawanaka [Sun, 15 Nov 2020 03:47:50 +0000 (12:47 +0900)]
verilog.cpp: Remove ccrystaltextview dependency

3 years agoMerge.rc: Rename the checkbox "Filter Comments" to "Ignore comment differences"
Takashi Sawanaka [Sun, 15 Nov 2020 02:01:04 +0000 (11:01 +0900)]
Merge.rc: Rename the checkbox "Filter Comments" to "Ignore comment differences"

3 years agoFix the problem that "Goto...", "Goto Line <line>" and moving by left click on the...
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.

3 years agoFix GitHub issue #403: [UI] Pane enlargement was reset after changing tab
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

3 years agoFix GitHub issue #456: Scrolling binary files
Takashi Sawanaka [Sat, 14 Nov 2020 10:56:59 +0000 (19:56 +0900)]
Fix GitHub issue #456: Scrolling binary files

3 years agoUpdate README.md
Takashi Sawanaka [Fri, 13 Nov 2020 12:58:16 +0000 (21:58 +0900)]
Update README.md

3 years agoInstaller: Display the contents of Readme-Lithuanian.txt at the end of the install...
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,

3 years agoUpdate Slovenian.po
Takashi Sawanaka [Fri, 13 Nov 2020 12:13:46 +0000 (21:13 +0900)]
Update Slovenian.po

3 years agoUpdate README.md
Takashi Sawanaka [Thu, 12 Nov 2020 23:57:15 +0000 (08:57 +0900)]
Update README.md

3 years agoMerge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Thu, 12 Nov 2020 23:54:25 +0000 (08:54 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge

3 years agoAdd TranslationStatus.*
Takashi Sawanaka [Thu, 12 Nov 2020 23:53:24 +0000 (08:53 +0900)]
Add TranslationStatus.*

3 years agoFix typo in memdc.h (#474)
Ikko Ashimine [Thu, 12 Nov 2020 22:57:28 +0000 (07:57 +0900)]
Fix typo in memdc.h (#474)

relevent -> relevant

3 years agoManual: IgnoreSectionMarkers.ini is no longer used because it has been changed to...
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)

3 years agoManual: IgnoreSectionMarkers.ini is no longer used because it has been changed to...
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.

3 years agoUpdate ReadMe-Slovenian.txt
Takashi Sawanaka [Wed, 11 Nov 2020 14:38:32 +0000 (23:38 +0900)]
Update ReadMe-Slovenian.txt

3 years agoFix typo in GhostTextBuffer.cpp (#472)
Ikko Ashimine [Mon, 9 Nov 2020 23:09:46 +0000 (08:09 +0900)]
Fix typo in GhostTextBuffer.cpp (#472)

preceeding -> preceding

3 years agoUpdate ReadMe-Slovenian.txt. Submitted by JadranR (issue #285)
Takashi Sawanaka [Mon, 9 Nov 2020 13:17:19 +0000 (22:17 +0900)]
Update ReadMe-Slovenian.txt. Submitted by JadranR (issue #285)

3 years agoUpdate Slovenian.po. 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)

3 years agoCrystalEdit/parsers: Remove unused variables
Takashi Sawanaka [Sun, 8 Nov 2020 10:59:22 +0000 (19:59 +0900)]
CrystalEdit/parsers: Remove unused variables

3 years agoCrystalEdit: Prevent comment blocks (<!-- -->) inside <style>...</style> and <script...
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)

3 years agoCrystalEdit: Prevent comment blocks (<!-- -->) inside <style>...</style> and <script...
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)

3 years agoCrystalEdit: Prevent comment blocks (<!-- -->) inside <style>...</style> and <script...
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

3 years agoCrystalEdit: innosetup.cpp: Don't treat {constant} or // as comments except in the...
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

3 years agoInstaller: Add ReadMe-Slovak.txt
Takashi Sawanaka [Thu, 5 Nov 2020 12:17:58 +0000 (21:17 +0900)]
Installer: Add ReadMe-Slovak.txt

3 years agoReadMe-Slovak.txt: Change the file encoding from UTF-8 to CP-1250
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

3 years agoUpdate Slovak.po
Takashi Sawanaka [Thu, 5 Nov 2020 11:55:51 +0000 (20:55 +0900)]
Update Slovak.po

3 years agoRename the new file slovak.po to Slovak.po and delete slovak.po because the different...
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.

3 years agoupdate slovak translation (#470)
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

3 years agocrystaledit/parses: Reduce Windows dependency
Takashi Sawanaka [Wed, 4 Nov 2020 13:00:34 +0000 (22:00 +0900)]
crystaledit/parses: Reduce Windows dependency

3 years agoUpdate Contributors.txt
Takashi Sawanaka [Wed, 4 Nov 2020 12:00:48 +0000 (21:00 +0900)]
Update Contributors.txt

3 years agoFix GitHub issue #468: Editor text display is abnormal - character spacing problem
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

3 years agoFix a build error
Takashi Sawanaka [Sun, 1 Nov 2020 23:11:01 +0000 (08:11 +0900)]
Fix a build error

3 years agoUpdate Portuguese.po
Takashi Sawanaka [Sun, 1 Nov 2020 22:00:09 +0000 (07:00 +0900)]
Update Portuguese.po

3 years agoSyntax-highlighter-based comment filter (Fix osdn.net ticket #40488) (#423) (2)
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)

3 years agoSyntax-highlighter-based comment filter (Fix osdn.net ticket #40488) (#423)
Takashi Sawanaka [Sun, 1 Nov 2020 14:33:04 +0000 (23:33 +0900)]
Syntax-highlighter-based comment filter (Fix osdn.net ticket #40488) (#423)

3 years agoUpdate Portuguese (#467)
Hugo Carvalho [Mon, 26 Oct 2020 22:57:44 +0000 (22:57 +0000)]
Update Portuguese (#467)

Translation completed

3 years agoFix GitHub issue #466: Reloading file does not refresh its encoding
Takashi Sawanaka [Mon, 26 Oct 2020 12:05:24 +0000 (21:05 +0900)]
Fix GitHub issue #466: Reloading file does not refresh its encoding

3 years agoUpdate English.pot (2)
Takashi Sawanaka [Mon, 26 Oct 2020 00:17:10 +0000 (09:17 +0900)]
Update English.pot (2)