Fix an issue where the message "The number of automatically merged changes: %1\nThe...

diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
index 18e3507..5749f59 100644 (file)
--- a/Src/ImgMergeFrm.cpp
+++ b/Src/ImgMergeFrm.cpp
@@ -300,7 +300,7 @@ void CImgMergeFrame::DoAutoMerge(int dstPane)
 
        AfxMessageBox(
                strutils::format_string2(
-                       _T("The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"), 
+                       _("The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"), 
                        strutils::format(_T("%d"), autoMergedCount),
                        strutils::format(_T("%d"), m_pImgMergeWindow->GetConflictCount())).c_str(),
                MB_ICONINFORMATION);

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index eb941ea..8598cab 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -1126,7 +1126,7 @@ void CMergeDoc::DoAutoMerge(int dstPane)
 
        ShowMessageBox(
                strutils::format_string2(
-                       _T("The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"), 
+                       _("The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"), 
                        strutils::format(_T("%d"), autoMergedCount),
                        strutils::format(_T("%d"), unresolvedConflictCount)),
                MB_ICONINFORMATION);