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

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/MainFrm.h
Simple merge

diff --cc Src/Merge.rc
Simple merge

diff --cc Src/OptionsDef.h
Simple merge

diff --cc Src/OptionsInit.cpp
Simple merge

diff --cc Src/resource.h
Simple merge

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

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

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

diff --cc Translations/WinMerge/Bulgarian.po
index 7fbd97f,f1352e3..754c4b5
--- 1/Translations/WinMerge/Bulgarian.po
--- 2/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@@ -852,23 -849,20 +852,20 @@@ msgstr "&Без преместени б
  msgid "&All Moved Blocks"
  msgstr "&Всички преместени блокове"
  
- msgid "Moved Block for &Current Diff"
- msgstr "Преместен блок за &текущо различие"
- 
  msgid "W&hitespaces"
 -msgstr "&Интервали"
 +msgstr "Празн&и места"
  
  msgid "Com&pare"
  msgstr "Срав&няване"
  
  msgid "I&gnore changes"
 -msgstr "Ð\9fÑ\80енебÑ\80е&гване на пÑ\80оменените"
 +msgstr "Ð\98&гноÑ\80иÑ\80ай пÑ\80омените"
  
  msgid "Ig&nore all"
 -msgstr "Ð\9fÑ\80е&небÑ\80егване на вÑ\81иÑ\87ки"
 +msgstr "Ð\98г&ноÑ\80иÑ\80ай вÑ\81иÑ\87ко"
  
- msgid "Case sensi&tive"
- msgstr "СÑ\8aвпадение на &регистъра"
+ msgid "Ignore &case"
+ msgstr "Ð\9fÑ\80енебÑ\80е&гване на регистъра"
  
  msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
  msgstr "Пренебрегване на &знаците за нов ред (Windows/Unix/Mac)"

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

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

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

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

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

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

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

diff --cc Translations/WinMerge/English.pot
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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