OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a987dc5 332c56c)
Merge branch 'master' of https://github.com/winmerge/winmerge into jp
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 23 Feb 2022 09:13:25 +0000 (18:13 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Wed, 23 Feb 2022 09:13:25 +0000 (18:13 +0900)
commit37f69997d6a2040e4feff695f9e7708413158dfc
tree014724e0da384461751b5554d70c59d47555f281tree | snapshot
parenta987dc5a5ae8041c81dd3921b0da4ca58b9fe3b8commit | diff
parent332c56c767402fe59ecb1d8c99b1d08001558426commit | diff
Merge branch 'master' of https://github.com/winmerge/winmerge into jp

# Conflicts:
# Translations/TranslationsStatus.html
# Translations/TranslationsStatus.md
# Translations/TranslationsStatus.xml
# Translations/WinMerge/English.pot
# Translations/WinMerge/Norwegian.po
39 files changed:
Src/Merge.rc diff1 | diff2 | blob | history
Translations/TranslationsStatus.md diff1 | diff2 | blob | history
Translations/WinMerge/Arabic.po diff1 | diff2 | blob | history
Translations/WinMerge/Basque.po diff1 | diff2 | blob | history
Translations/WinMerge/Brazilian.po diff1 | diff2 | blob | history
Translations/WinMerge/Bulgarian.po diff1 | diff2 | blob | history
Translations/WinMerge/Catalan.po diff1 | diff2 | blob | history
Translations/WinMerge/ChineseSimplified.po diff1 | diff2 | blob | history
Translations/WinMerge/ChineseTraditional.po diff1 | diff2 | blob | history
Translations/WinMerge/Corsican.po diff1 | diff2 | blob | history
Translations/WinMerge/Croatian.po diff1 | diff2 | blob | history
Translations/WinMerge/Czech.po diff1 | diff2 | blob | history
Translations/WinMerge/Danish.po diff1 | diff2 | blob | history
Translations/WinMerge/Dutch.po diff1 | diff2 | blob | history
Translations/WinMerge/English.pot diff1 | diff2 | blob | history
Translations/WinMerge/Finnish.po diff1 | diff2 | blob | history
Translations/WinMerge/French.po diff1 | diff2 | blob | history
Translations/WinMerge/Galician.po diff1 | diff2 | blob | history
Translations/WinMerge/German.po diff1 | diff2 | blob | history
Translations/WinMerge/Greek.po diff1 | diff2 | blob | history
Translations/WinMerge/Hungarian.po diff1 | diff2 | blob | history
Translations/WinMerge/Italian.po diff1 | diff2 | blob | history
Translations/WinMerge/Japanese.po diff1 | diff2 | blob | history
Translations/WinMerge/Korean.po diff1 | diff2 | blob | history
Translations/WinMerge/Lithuanian.po diff1 | diff2 | blob | history
Translations/WinMerge/Norwegian.po diff1 | diff2 | blob | history
Translations/WinMerge/Persian.po diff1 | diff2 | blob | history
Translations/WinMerge/Polish.po diff1 | diff2 | blob | history
Translations/WinMerge/Portuguese.po diff1 | diff2 | blob | history
Translations/WinMerge/Romanian.po diff1 | diff2 | blob | history
Translations/WinMerge/Russian.po diff1 | diff2 | blob | history
Translations/WinMerge/Serbian.po diff1 | diff2 | blob | history
Translations/WinMerge/Sinhala.po diff1 | diff2 | blob | history
Translations/WinMerge/Slovak.po diff1 | diff2 | blob | history
Translations/WinMerge/Slovenian.po diff1 | diff2 | blob | history
Translations/WinMerge/Spanish.po diff1 | diff2 | blob | history
Translations/WinMerge/Swedish.po diff1 | diff2 | blob | history
Translations/WinMerge/Turkish.po diff1 | diff2 | blob | history
Translations/WinMerge/Ukrainian.po diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help