Merge with stable

[winmerge-jp/winmerge-jp.git] / Src / LocationView.cpp

diff --git a/Src/LocationView.cpp b/Src/LocationView.cpp
index d5e9129..64c55b7 100644 (file)
--- a/Src/LocationView.cpp
+++ b/Src/LocationView.cpp
@@ -803,7 +803,7 @@ void CLocationView::OnContextMenu(CWnd* pWnd, CPoint point)
        }
 
        String strItem;
-       CString strNum;
+       String strNum;
        int nLine = -1;
        int bar = IsInsideBar(rc, pt);
 
@@ -814,11 +814,11 @@ void CLocationView::OnContextMenu(CWnd* pWnd, CPoint point)
                if (bar == BAR_YAREA)
                        bar = BAR_0;
                nLine = GetLineFromYPos(pt.y, bar);
-               strNum.Format(_T("%d"), nLine + 1); // Show linenumber not lineindex
+               strNum = string_to_str(nLine + 1); // Show linenumber not lineindex
        }
        else
                pPopup->EnableMenuItem(ID_LOCBAR_GOTODIFF, MF_GRAYED);
-       strItem = LangFormatString1(ID_LOCBAR_GOTOLINE_FMT, strNum);
+       strItem = string_format_string1(_("G&oto Line %1"), strNum);
        pPopup->SetMenuText(ID_LOCBAR_GOTODIFF, strItem.c_str(), MF_BYCOMMAND);
 
        // invoke context menu