From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 27 Jan 2019 23:01:51 +0000 (+0900)
Subject: MergeDoc.cpp: Recover lost compatibility
X-Git-Tag: 2.16.5~469
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1373d5ff118b497219475dfe2a349b987e2a10f2;p=winmerge-jp%2Fwinmerge-jp.git

MergeDoc.cpp: Recover lost compatibility
---

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 84316d40b..25ba81bd7 100644
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -571,7 +571,7 @@ void CMergeDoc::CheckFileChanged(void)
 		if (FileChange[nBuffer] == FileChanged)
 		{
 			String msg = strutils::format_string1(_("Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"), m_filePaths[nBuffer]);
-			if (ShowMessageBox(msg, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN) == IDYES)
+			if (ShowMessageBox(msg, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_FILECHANGED_RESCAN) == IDYES)
 			{
 				OnFileReload();
 			}
@@ -763,7 +763,7 @@ void CMergeDoc::ShowRescanError(int nRescanResult, IDENTLEVEL identical)
 			if (theApp.m_bExitIfNoDiff != MergeCmdLineInfo::ExitQuiet)
 			{
 				s = _("The selected files are identical.");
-				ShowMessageBox(s, nFlags);
+				ShowMessageBox(s, nFlags, IDS_FILESSAME);
 			}
 
 			// Exit application if files are identical.