Merge remote-tracking branch 'upstream/master' into jp

diff --cc Translations/WinMerge/French.po
index 712f747,19b5005..62cdca8
--- 1/Translations/WinMerge/French.po
--- 2/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@@ -473,14 -473,11 +473,14 @@@ msgstr "Notes de v&ersion
  
  #, c-format
  msgid "&Translations"
- msgstr "&Traductions"
+ msgstr "&Traductions sur le Web"
  
 +msgid "&Check For Updates"
 +msgstr ""
 +
  #, c-format
  msgid "C&onfiguration"
- msgstr "&Configuration"
+ msgstr "&Journal de configuration"
  
  #, c-format
  msgid "&GNU General Public License"