OSDN Git Service

MergeDoc.cpp: Recover lost compatibility
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 27 Jan 2019 23:01:51 +0000 (08:01 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 27 Jan 2019 23:01:51 +0000 (08:01 +0900)
Src/MergeDoc.cpp

index 84316d4..25ba81b 100644 (file)
@@ -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.