OSDN Git Service
LMS [Sat, 25 Apr 2020 10:18:45 +0000 (12:18 +0200)]
Merge pull request #2 from WinMerge/master
Puesta al día del clonado
Takashi Sawanaka [Sat, 25 Apr 2020 05:53:22 +0000 (14:53 +0900)]
Update .gitignore
Takashi Sawanaka [Sat, 25 Apr 2020 05:52:57 +0000 (14:52 +0900)]
crystaledit/Sample: Fix buid error
Takashi Sawanaka [Sat, 25 Apr 2020 04:15:14 +0000 (13:15 +0900)]
Fix GitHub issue #320: Codepage not updated on refresh
Takashi Sawanaka [Sat, 25 Apr 2020 01:59:11 +0000 (10:59 +0900)]
Update .gitignore
Takashi Sawanaka [Sat, 25 Apr 2020 01:56:15 +0000 (10:56 +0900)]
Fix GitHub issue #314: The markers utility has a drop-down menu that is not internationalizeda
Takashi Sawanaka [Sat, 25 Apr 2020 01:30:05 +0000 (10:30 +0900)]
ImageComapre:
- Make Location Pane translatable
- Add two dragging modes (vertical wipe and horizontal wipe)
Takashi Sawanaka [Sat, 25 Apr 2020 01:17:10 +0000 (10:17 +0900)]
Fix sf.net ticket #2236: PreDiffLineFilter
Takashi Sawanaka [Wed, 22 Apr 2020 14:03:22 +0000 (23:03 +0900)]
Add "Enable image compare in folder compare" option to Options dialog (2)
Takashi Sawanaka [Wed, 22 Apr 2020 09:02:25 +0000 (18:02 +0900)]
Fix Github issue #316: GUI glitches/bugs #2
Takashi Sawanaka [Wed, 22 Apr 2020 09:01:43 +0000 (18:01 +0900)]
Add "Enable image compare in folder compare" option to Options dialog
Takashi Sawanaka [Sun, 19 Apr 2020 14:31:31 +0000 (23:31 +0900)]
BinaryCompare.h: Fix comments
Takashi Sawanaka [Sun, 19 Apr 2020 14:27:43 +0000 (23:27 +0900)]
Update Galician.po
LMS [Fri, 17 Apr 2020 14:49:20 +0000 (16:49 +0200)]
Merge pull request #1 from WinMerge/master
Merge pull request #313 from qosobrin/master
Takashi Sawanaka [Fri, 17 Apr 2020 13:28:28 +0000 (22:28 +0900)]
update wsl_wine_test_64.cmd
Takashi Sawanaka [Fri, 17 Apr 2020 13:26:58 +0000 (22:26 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Fri, 17 Apr 2020 13:26:13 +0000 (22:26 +0900)]
Merge.rc: Tweak
Takashi Sawanaka [Fri, 17 Apr 2020 11:52:48 +0000 (20:52 +0900)]
Merge pull request #313 from qosobrin/master
Galician WinMerge translation complete
Takashi Sawanaka [Fri, 17 Apr 2020 11:52:36 +0000 (20:52 +0900)]
Merge branch 'master' into master
LMS [Fri, 17 Apr 2020 09:20:37 +0000 (11:20 +0200)]
Atajos revisados
Takashi Sawanaka [Thu, 16 Apr 2020 13:16:56 +0000 (22:16 +0900)]
ccrystaltextview.cpp: Fix crash at preview when the printer is not installed. (I discovered this when I ran WinMerge on Wine.)
LMS [Thu, 16 Apr 2020 07:32:59 +0000 (09:32 +0200)]
Primera pasada de atajos de teclado completa
Takashi Sawanaka [Wed, 15 Apr 2020 14:16:54 +0000 (23:16 +0900)]
Fix crash in the About dialog when running WinMerge on Wine.
Takashi Sawanaka [Wed, 15 Apr 2020 13:11:41 +0000 (22:11 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Wed, 15 Apr 2020 13:11:09 +0000 (22:11 +0900)]
Add WSLWineTest
Takashi Sawanaka [Wed, 15 Apr 2020 12:56:35 +0000 (21:56 +0900)]
Update main.yml [skip ci]
Takashi Sawanaka [Wed, 15 Apr 2020 11:22:03 +0000 (20:22 +0900)]
Merge pull request #312 from tkoester/patch-1
"Patience" diff refers to the card game
Thorsten Köster [Wed, 15 Apr 2020 08:42:23 +0000 (10:42 +0200)]
Update German.po
Der Begriff "patience" bezieht sich auf das Kartenspiel: https://blog.jcoglan.com/2017/09/19/the-patience-diff-algorithm/
Takashi Sawanaka [Tue, 14 Apr 2020 22:58:23 +0000 (07:58 +0900)]
Cppcheck: The scope of the variable '...' can be reduced.
Takashi Sawanaka [Tue, 14 Apr 2020 22:53:55 +0000 (07:53 +0900)]
Update Glician.po
LMS [Tue, 14 Apr 2020 21:48:46 +0000 (23:48 +0200)]
Corrección de los atajos de teclado de los dos primeros menús y algunas cadenas
qosobrin [Tue, 14 Apr 2020 20:16:36 +0000 (22:16 +0200)]
Corrección de discrepancias en las terminaciones de las cadenas
qosobrin [Tue, 14 Apr 2020 20:12:10 +0000 (22:12 +0200)]
Primera traducción completa
Terminada la traducción de todas las cadenas. Pendiente revisión en la interfaz.
qosobrin [Tue, 14 Apr 2020 09:03:11 +0000 (11:03 +0200)]
Correcciones menores
Takashi Sawanaka [Mon, 13 Apr 2020 23:18:32 +0000 (08:18 +0900)]
Fix GitHub issue #276: The icons on a 43" 4K screen are too small.
qosobrin [Mon, 13 Apr 2020 21:59:25 +0000 (23:59 +0200)]
Cambios hasta el mensaje 700
qosobrin [Mon, 13 Apr 2020 17:29:53 +0000 (19:29 +0200)]
Cambios hasta el mensaje 637
qosobrin [Mon, 13 Apr 2020 10:36:52 +0000 (12:36 +0200)]
Corrección de guiones y espacios al comienzo/final
qosobrin [Sun, 12 Apr 2020 20:03:01 +0000 (22:03 +0200)]
Cambios hasta el mensaje 205
qosobrin [Sun, 12 Apr 2020 18:20:48 +0000 (20:20 +0200)]
Cambios hasta el mensaje 109
qosobrin [Sun, 12 Apr 2020 10:53:31 +0000 (12:53 +0200)]
Corrección de errores de formato
Se corrigen los errores de formato entre la cadena original y la traducida.
Takashi Sawanaka [Sat, 11 Apr 2020 23:22:28 +0000 (08:22 +0900)]
Merge pull request #308 from qosobrin/master
ReadMe file Spanish and Galician translations update
qosobrin [Sat, 11 Apr 2020 22:12:34 +0000 (00:12 +0200)]
Corregidas las elipsis finales
Cambiados los tres puntos por el símbolo correcto …
qosobrin [Sat, 11 Apr 2020 16:28:26 +0000 (18:28 +0200)]
ReadMe file Spanish and Galician translastion update
Takashi Sawanaka [Fri, 10 Apr 2020 10:51:19 +0000 (19:51 +0900)]
Update BuildArc.cmd
Takashi Sawanaka [Thu, 9 Apr 2020 23:25:03 +0000 (08:25 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Thu, 9 Apr 2020 23:20:54 +0000 (08:20 +0900)]
Update BuildArc.cmd
Takashi Sawanaka [Thu, 9 Apr 2020 12:53:43 +0000 (21:53 +0900)]
Update README.md [ci skip]
Takashi Sawanaka [Thu, 9 Apr 2020 12:40:17 +0000 (21:40 +0900)]
Update README.md
Takashi Sawanaka [Thu, 9 Apr 2020 11:02:45 +0000 (20:02 +0900)]
BuildArc.cmd: Removed spaces from artifact file names
Takashi Sawanaka [Thu, 9 Apr 2020 10:30:17 +0000 (19:30 +0900)]
Update main.yml
Takashi Sawanaka [Thu, 9 Apr 2020 10:10:27 +0000 (19:10 +0900)]
Create main.yml
Takashi Sawanaka [Thu, 9 Apr 2020 05:30:58 +0000 (14:30 +0900)]
DirView.cpp: Fix parent folder lines not being colored
Takashi Sawanaka [Thu, 9 Apr 2020 05:02:28 +0000 (14:02 +0900)]
Fix Github issue #307: Diff Pane issues(1.)
Takashi Sawanaka [Thu, 9 Apr 2020 05:00:43 +0000 (14:00 +0900)]
Fix crash when selecting the Window->Split menu item in Diff Pane.
Takashi Sawanaka [Thu, 9 Apr 2020 00:34:09 +0000 (09:34 +0900)]
Currently, for some reason it takes 90 seconds to run UpdatePoFilesFromPotFile.vbs, so I rewrote UpdatePoFilesFromPotFile.vbs with Powershell+C#.
Takashi Sawanaka [Tue, 7 Apr 2020 13:02:10 +0000 (22:02 +0900)]
Remove unused variables
Takashi Sawanaka [Mon, 6 Apr 2020 23:19:45 +0000 (08:19 +0900)]
Fix osdn.net ticket #40308: Pressing the [Compare/Binary] category button in the Options dialog twice will cause a crash.
Takashi Sawanaka [Sun, 5 Apr 2020 11:29:54 +0000 (20:29 +0900)]
MergeStatusBar.cpp: Fix the font color not being applied.
Takashi Sawanaka [Sun, 5 Apr 2020 11:20:09 +0000 (20:20 +0900)]
PreferencesDlg.*: Remove an unused function
Takashi Sawanaka [Sun, 5 Apr 2020 11:19:28 +0000 (20:19 +0900)]
MergeApp.h: Fix mixed eol-style
Takashi Sawanaka [Sun, 5 Apr 2020 10:20:43 +0000 (19:20 +0900)]
Merge pull request #306 from Gitoffthelawn/patch-1
Update winmerge.org URL to HTTPS, many small improvements
Gitoffthelawn [Sun, 5 Apr 2020 05:05:30 +0000 (22:05 -0700)]
Update winmerge.org URL to HTTPS, many small improvements
Thank you to everyone working on WinMerge!
Takashi Sawanaka [Sat, 4 Apr 2020 12:38:04 +0000 (21:38 +0900)]
Update Spanish.po
Takashi Sawanaka [Sat, 4 Apr 2020 11:46:00 +0000 (20:46 +0900)]
Merge pull request #305 from Lippe35/patch-1
Correction Portuguese Portugal
Takashi Sawanaka [Sat, 4 Apr 2020 11:45:37 +0000 (20:45 +0900)]
Merge pull request #304 from njarizas/spanishtranslation
spanish translation
Nelson Javier Ariza Santamaria [Fri, 3 Apr 2020 19:55:17 +0000 (14:55 -0500)]
minor changes
Nelson Javier Ariza Santamaria [Fri, 3 Apr 2020 19:47:24 +0000 (14:47 -0500)]
progress in Spanish translation. keyboard shortcuts are corrected, trying to make them as similar as possible to English
Lippe35 [Fri, 3 Apr 2020 17:52:15 +0000 (18:52 +0100)]
Correction
Nelson Javier Ariza Santamaria [Fri, 3 Apr 2020 14:56:08 +0000 (09:56 -0500)]
spanish translation
Takashi Sawanaka [Fri, 3 Apr 2020 12:43:48 +0000 (21:43 +0900)]
Fix the problem of HTML Flie Compare Report not showing whitespace at the beginning of a line
Takashi Sawanaka [Fri, 3 Apr 2020 11:32:25 +0000 (20:32 +0900)]
Update Russian.po
Takashi Sawanaka [Fri, 3 Apr 2020 11:27:18 +0000 (20:27 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Fri, 3 Apr 2020 11:26:53 +0000 (20:26 +0900)]
Fix GitHub issue #299: DST causes incorrect dates shown in Date column
Takashi Sawanaka [Thu, 2 Apr 2020 22:48:46 +0000 (07:48 +0900)]
Merge pull request #303 from mayswind/master
update Simplified Chinese translation
Takashi Sawanaka [Thu, 2 Apr 2020 22:48:23 +0000 (07:48 +0900)]
Merge pull request #302 from wvxwxvw/patch-1
Update Russian.po
mayswind [Thu, 2 Apr 2020 11:53:13 +0000 (19:53 +0800)]
Update ChineseSimplified.po
wvxwxvw [Thu, 2 Apr 2020 09:12:53 +0000 (12:12 +0300)]
Update Russian.po
Takashi Sawanaka [Wed, 1 Apr 2020 23:05:45 +0000 (08:05 +0900)]
Fix GitHub issue #297: Allow specifying default for EOL warning checkbox
Takashi Sawanaka [Tue, 31 Mar 2020 23:05:24 +0000 (08:05 +0900)]
Folder Compare: Fix a problem where a text file could be considered a binary file. (osdn.net #40296)
Takashi Sawanaka [Mon, 30 Mar 2020 22:55:32 +0000 (07:55 +0900)]
Merge pull request #300 from scscgit/master
Translation fix: Slovak "To right:" was "To left:"
Takashi Sawanaka [Mon, 30 Mar 2020 22:54:02 +0000 (07:54 +0900)]
Merge pull request #298 from Tichij/master
Update of Lithuanian translation
scscgit [Mon, 30 Mar 2020 20:00:41 +0000 (22:00 +0200)]
Translation fix: Slovak "To right:" was "To left:"
Tichij [Mon, 30 Mar 2020 04:49:01 +0000 (07:49 +0300)]
Update of Lithuanian translation
Takashi Sawanaka [Sun, 29 Mar 2020 14:18:44 +0000 (23:18 +0900)]
- Add Solarized Dark/Light color scheme
- Add the Color Schemes category to the Options dialog
- Fix the problem of margin color and text color not being applied to HTML reports
Takashi Sawanaka [Wed, 25 Mar 2020 13:26:44 +0000 (22:26 +0900)]
Fix GitHub issue #294: Does not process CFSTR_PREFERREDDROPEFFECT on drag/drop
Takashi Sawanaka [Mon, 23 Mar 2020 22:20:33 +0000 (07:20 +0900)]
Merge branch 'master' of https://github.com/winmerge/winmerge
Takashi Sawanaka [Mon, 23 Mar 2020 22:19:56 +0000 (07:19 +0900)]
editor addin.sct: Fix handling of line breaks in SortAscending, SortDescending (osdn.net ticket #40266) (2)
Takashi Sawanaka [Sun, 22 Mar 2020 22:50:08 +0000 (07:50 +0900)]
Merge pull request #293 from qosobrin/master
Typographical and encoding corrections to Galician and Spanish Shell Extension translations
LMS [Sun, 22 Mar 2020 12:58:07 +0000 (13:58 +0100)]
Typographical and encoding corrections to Galician and Spanish Shell Extension translatations
Takashi Sawanaka [Sun, 22 Mar 2020 06:52:12 +0000 (15:52 +0900)]
Rename PropColors.* to PropMergeColors.*
Takashi Sawanaka [Sun, 22 Mar 2020 02:07:23 +0000 (11:07 +0900)]
Add ColorSchemes folder
Takashi Sawanaka [Sun, 22 Mar 2020 00:56:16 +0000 (09:56 +0900)]
Update frhed and ShellExtension
Takashi Sawanaka [Sun, 22 Mar 2020 00:43:41 +0000 (09:43 +0900)]
Update Slovenian.po
Takashi Sawanaka [Sun, 22 Mar 2020 00:42:15 +0000 (09:42 +0900)]
ShellExtension: Bump revision to 1.17.12.0
Takashi Sawanaka [Sun, 22 Mar 2020 00:34:12 +0000 (09:34 +0900)]
Merge pull request #292 from qosobrin/master
Galician and Spanish translations update
LMS [Sat, 21 Mar 2020 18:37:44 +0000 (19:37 +0100)]
Shell Extension Spanish translation
LMS [Sat, 21 Mar 2020 18:36:24 +0000 (19:36 +0100)]
InnoSetup Spanish translation
LMS [Sat, 21 Mar 2020 18:35:43 +0000 (19:35 +0100)]
Shell Extension Galician translation
LMS [Sat, 21 Mar 2020 18:35:17 +0000 (19:35 +0100)]
InnoSetup Galician translation
OSDN Git Service
