Merge with stable

[winmerge-jp/winmerge-jp.git] / Src / Common / LanguageSelect.h

diff --git a/Src/Common/LanguageSelect.h b/Src/Common/LanguageSelect.h
index d102a7b..60fd26b 100644 (file)
--- a/Src/Common/LanguageSelect.h
+++ b/Src/Common/LanguageSelect.h
@@ -5,10 +5,10 @@
  */
 #pragma once
 
-#include "CMoveConstraint.h"
-
 #include <vector>
 #include <string>
+#include <map>
+#include "CMoveConstraint.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CLanguageSelect dialog
@@ -33,6 +33,7 @@ public:
 
        bool TranslateString(size_t line, std::string &) const;
        bool TranslateString(size_t line, std::wstring &) const;
+       bool TranslateString(const std::string&, String &) const;
        void SetIndicators(CStatusBar &, const UINT *, int) const;
        void TranslateMenu(HMENU) const;
        void TranslateDialog(HWND) const;
@@ -50,6 +51,8 @@ private:
        HINSTANCE m_hCurrentDll;
        LANGID m_wCurLanguage;
        std::vector<std::string> m_strarray;
+       typedef std::map<std::string, int> EngLinenoMap;
+       EngLinenoMap m_map_lineno;
        unsigned m_codepage;
 // Implementation methods
 private: