git.osdn.net Git - winmerge-jp/winmerge-jp.git/commit

author	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Sun, 19 Jan 2020 13:11:37 +0000 (22:11 +0900)
committer	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Sun, 19 Jan 2020 13:11:37 +0000 (22:11 +0900)
commit	c2d2e9545d8cb95345a17c26039fceaafaee7419
tree	4a1dfc52bc86d73aafb370725b2d6f47215c22b2	tree \| snapshot
parent	31d4032f2d0b4f3ee09e6db6400f8647f37ae231	commit \| diff
parent	e5aa42f1cf00086df434ef79c931de39fbd1af32	commit \| diff

Merge branch 'master' of https://github.com/winmerge/winmerge into jp

Src/Merge.rc	diff1 \|	diff2 \|	blob \| history
Src/OptionsDef.h	diff1 \|	diff2 \|	blob \| history
Src/OptionsInit.cpp	diff1 \|	diff2 \|	blob \| history
Src/resource.h	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/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