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

# Conflicts:
#	Externals/winimerge

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/resource.h
Simple merge

diff --cc Translations/WinMerge/Lithuanian.po
Simple merge

diff --cc Translations/WinMerge/Slovenian.po
index 0446889,3da4fb5..10dc5d5
--- 1/Translations/WinMerge/Slovenian.po
--- 2/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@@ -364,12 -364,9 +364,12 @@@ msgstr "Opombe ob i&zdaji
  msgid "&Translations"
  msgstr "P&revodi"
  
 +msgid "&Check For Updates"
 +msgstr ""
 +
  #, c-format
  msgid "C&onfiguration"
- msgstr "&Dnevnik nastavitev"
+ msgstr "Nas&tavitve"
  
  #, c-format
  msgid "&GNU General Public License"