Index: /ng/cplusplus/i3/src/LibintlUtf16le.cpp
===================================================================
--- /lang/cplusplus/i3/src/LibintlUtf16le.cpp (revision 19274)
+++  (revision )
@@ -1,62 +1,0 @@
-#include <PrecompiledHeaders.h>
-#include "Common.h"
-#include "../intl/wlibintl.h"
-
-namespace i3
-{
-
-#ifdef MOL_OS_WINDOWS
-char locale_dir_utf8[2000] = {};
-const char* windows_locale_dir_utf8_ = locale_dir_utf8;
-
-void init_windows_gettext()
-{
-    using namespace std;
-    {
-        TCHAR locale_dir_utf16[1000];
-        DWORD result = GetModuleFileName(
-                           GetModuleHandle(NULL),
-                           locale_dir_utf16,
-                           _countof(locale_dir_utf16));
-        if (result == 0 || result == sizeof(locale_dir_utf16))   // error
-        {
-            return;
-        }
-        if (PathRemoveFileSpec(locale_dir_utf16) == FALSE)
-        {
-            return;
-        }
-
-        if (0 != _tcscat_s(locale_dir_utf16, _T("\\locale")))
-        {
-            return;
-        }
-
-// #if defined(UNICODE) || defined(_UNICODE)
-//         if (0 == WideCharToMultiByte(
-//                     CP_UTF8,
-//                     0,
-//                     locale_dir_utf16,
-//                     -1,
-//                     locale_dir_utf8,
-//                     sizeof(locale_dir_utf8),
-//                     0,0))
-//         {
-//             return;
-//         }
-// #else
-// #error
-// #endif
-        setlocale(LC_ALL, "");
-        bindtextdomain(PACKAGE_NAME, locale_dir_utf16);
-//        bindtextdomain(PACKAGE_NAME, LOCALEDIR);
-    }
-#if defined(UNICODE) || defined(_UNICODE)
-    bind_textdomain_codeset(PACKAGE_NAME,"UTF-16LE");
-#endif
-    textdomain(PACKAGE_NAME);
-}
-#endif //MOL_OS_WINDOWS
-}
-
-
Index: /lang/cplusplus/i3/po/POTFILES.in
===================================================================
--- /lang/cplusplus/i3/po/POTFILES.in (revision 18991)
+++ /lang/cplusplus/i3/po/POTFILES.in (revision 19276)
@@ -30,5 +30,4 @@
 src/Mediator.cpp
 src/Mediator.h
-src/mol/include/mol/BoostTestDummyLib.cpp
 src/mol/include/mol/Debug.h
 src/mol/include/mol/Environment.h
@@ -61,8 +60,11 @@
 src/mol/include/mol/StaticData.cpp
 src/mol/include/mol/Thread.h
+src/mol/src/BoostTestDummyLib.cpp
+src/mol/src/BoostTestMain.cpp
 src/mol/src/DebugLogger.cpp
 src/mol/src/StdAfx.cpp
-src/mol/src/Test.cpp
+src/mol/src/Test1.cpp
 src/mol/src/Test2.cpp
+src/mol/src/Test3.cpp
 src/mol/src/windows/WindowProcedureTest.cpp
 src/os-posix/Os.cpp