Merge with default

--HG--
branch : jp

diff --cc BuildArc.cmd
index ba12ec0,1d233b5..04bbfad
--- 1/BuildArc.cmd
--- 2/BuildArc.cmd
+++ b/BuildArc.cmd
@@@ -56,11 -61,12 +61,12 @@@ for %%i in (Languages Filters MergePlug
  )
  
  rem Docs
 -for %%i in (Translations\Docs\Readme\ReadMe-*.txt Build\Manual\htmlhelp\WinMerge.chm Docs\Users\ReleaseNotes.html Docs\Users\ChangeLog.txt) do (
+ echo Copy Docs...
-   copy "%%i" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Docs"
 +for %%i in (Translations\Docs\Readme\ReadMe-*.txt Build\Manual\htmlhelp\WinMerge.chm Build\Manual\htmlhelp\WinMergeJapanese.chm Docs\Users\ReleaseNotes.html Docs\Users\ChangeLog.txt) do (
+   copy "%%i" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Docs" > NUL
  )
  for %%i in (Src\COPYING Docs\Users\Contributors.txt Docs\Users\ReadMe.txt) do (
-   copy "%%i" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge"
+   copy "%%i" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge" > NUL
  )
  
  rem Excecutables

diff --cc Installer/InnoSetup/WinMerge.iss
index 836aeac,d0b48c7..6ae2a66
--- 1/Installer/InnoSetup/WinMerge.iss
--- 2/Installer/InnoSetup/WinMerge.iss
+++ b/Installer/InnoSetup/WinMerge.iss
@@@ -472,9 -472,9 +472,10 @@@ Source: ..\..\Translations\WinMerge\Gre
  Source: ..\..\Translations\Docs\Readme\ReadMe-Greek.txt; DestDir: {app}\Docs; Components: Languages\Greek\r
  Source: ..\..\Translations\WinMerge\Hungarian.po; DestDir: {app}\Languages; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp\r
  Source: ..\..\Translations\WinMerge\Italian.po; DestDir: {app}\Languages; Components: Languages\Italian; Flags: ignoreversion comparetimestamp\r
+ Source: ..\..\Translations\Docs\Readme\ReadMe-Italian.txt; DestDir: {app}\Docs; Components: Languages\Italian\r
  Source: ..\..\Translations\WinMerge\Japanese.po; DestDir: {app}\Languages; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp\r
  Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese\r
 +Source: ..\..\Build\Manual\htmlhelp\WinMergeJapanese.chm; DestDir: {app}\Docs; Components: Languages\Japanese\r
  Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp\r
  Source: ..\..\Translations\Docs\Readme\ReadMe-Lithuanian.txt; DestDir: {app}\Docs; Components: Languages\Lithuanian\r
  Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp\r

diff --cc Installer/InnoSetup/WinMergeX64.is6.iss
index b5526fe,3c40b1e..15607be
--- 1/Installer/InnoSetup/WinMergeX64.is6.iss
--- 2/Installer/InnoSetup/WinMergeX64.is6.iss
+++ b/Installer/InnoSetup/WinMergeX64.is6.iss
@@@ -453,9 -453,9 +453,10 @@@ Source: ..\..\Translations\WinMerge\Gre
  Source: ..\..\Translations\Docs\Readme\ReadMe-Greek.txt; DestDir: {app}\Docs; Components: Languages\Greek\r
  Source: ..\..\Translations\WinMerge\Hungarian.po; DestDir: {app}\Languages; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp\r
  Source: ..\..\Translations\WinMerge\Italian.po; DestDir: {app}\Languages; Components: Languages\Italian; Flags: ignoreversion comparetimestamp\r
+ Source: ..\..\Translations\Docs\Readme\ReadMe-Italian.txt; DestDir: {app}\Docs; Components: Languages\Italian\r
  Source: ..\..\Translations\WinMerge\Japanese.po; DestDir: {app}\Languages; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp\r
  Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese\r
 +Source: ..\..\Build\Manual\htmlhelp\WinMergeJapanese.chm; DestDir: {app}\Docs; Components: Languages\Japanese\r
  Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp\r
  Source: ..\..\Translations\Docs\Readme\ReadMe-Lithuanian.txt; DestDir: {app}\Docs; Components: Languages\Lithuanian\r
  Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp\r

diff --cc Installer/InnoSetup/WinMergeX64.iss
index 444e495,0d4894a..a49acd1
--- 1/Installer/InnoSetup/WinMergeX64.iss
--- 2/Installer/InnoSetup/WinMergeX64.iss
+++ b/Installer/InnoSetup/WinMergeX64.iss
@@@ -451,9 -451,9 +451,10 @@@ Source: ..\..\Translations\WinMerge\Gre
  Source: ..\..\Translations\Docs\Readme\ReadMe-Greek.txt; DestDir: {app}\Docs; Components: Languages\Greek\r
  Source: ..\..\Translations\WinMerge\Hungarian.po; DestDir: {app}\Languages; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp\r
  Source: ..\..\Translations\WinMerge\Italian.po; DestDir: {app}\Languages; Components: Languages\Italian; Flags: ignoreversion comparetimestamp\r
+ Source: ..\..\Translations\Docs\Readme\ReadMe-Italian.txt; DestDir: {app}\Docs; Components: Languages\Italian\r
  Source: ..\..\Translations\WinMerge\Japanese.po; DestDir: {app}\Languages; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp\r
  Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese\r
 +Source: ..\..\Build\Manual\htmlhelp\WinMergeJapanese.chm; DestDir: {app}\Docs; Components: Languages\Japanese\r
  Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp\r
  Source: ..\..\Translations\Docs\Readme\ReadMe-Lithuanian.txt; DestDir: {app}\Docs; Components: Languages\Lithuanian\r
  Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp\r

diff --cc Translations/WinMerge/Bulgarian.po
index 86d0d03,0c7cb3c..a65d1cf
--- 1/Translations/WinMerge/Bulgarian.po
--- 2/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@@ -335,23 -259,15 +260,18 @@@ msgstr "Б&ележки към изда
  msgid "&Translations"
  msgstr "&Преводи"
  
- #, c-format
 +msgid "&Check For Updates"
 +msgstr ""
 +
  msgid "C&onfiguration"
- msgstr "Конфигурация"
+ msgstr "&Настройки"
  
- #, c-format
  msgid "&GNU General Public License"
- msgstr "&GNU Ð\9fубличен лиценз"
+ msgstr "&GNU обÑ\89 публичен лиценз"
  
- #, c-format
  msgid "&About WinMerge..."
- msgstr "&Ð\97а WinMerge..."
+ msgstr "&Ð\9eÑ\82ноÑ\81но WinMergeâ\80¦"
  
- #, c-format
  msgid "&Read-only"
  msgstr "&Само за четене"
  
@@@ -3894,8 -3282,8 +3286,9 @@@ msgstr "%1 не Ñ\81Ñ\8aÑ\89еÑ\81Ñ\82вÑ\83ва. Ð
  msgid "Failed to create folder."
  msgstr "Неуспешно създаване на папка."
  
- #, c-format
- msgid "You can specify the following parameters to the path:\n$file: Path name of the current file\n$linenum: Line number of the current cursor position"
+ msgid ""
+ "You can specify the following parameters to the path:\n"
+ "$file: Path name of the current file\n"
+ "$linenum: Line number of the current cursor position"
  msgstr ""
 +

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

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