diff --git a/CMake/GenerateConfigProperties.cpp b/CMake/GenerateConfigProperties.cpp
index e8cfed5c2ba33b64c0cf571a21070b174148a3c6..b18a5859bcbc62bced6f2a5754cb4e9aa9d2aa72 100644
--- a/CMake/GenerateConfigProperties.cpp
+++ b/CMake/GenerateConfigProperties.cpp
@@ -57,11 +57,11 @@ int main(int argc, char* argv[])
    }
    
    /** Get local configuration*/
-   const std::locale& mylocale = std::locale("");
-   std::string language = mylocale.name();
+//    const std::locale& mylocale = std::locale("");
+//    std::string language = mylocale.name();
    
-   if (language == "C")
-     language = "en_EN.UTF-8";
+//    if (language == "C")
+   std::string language = "en_EN.UTF-8";
    
    /** Write parameters to the configuration file*/
    os << "#Auto generated by config-properties \n"
diff --git a/Code/Common/otbI18n.h b/Code/Common/otbI18n.h
index 6131adea7bbb196826cb234aafe3c810a4f64a4b..7681994ca194735d6123d77ae80fe789f5cd2e04 100644
--- a/Code/Common/otbI18n.h
+++ b/Code/Common/otbI18n.h
@@ -35,7 +35,7 @@
   typedef otb::ConfigurationFile        ConfigurationType;\
   ConfigurationType::Pointer conf = ConfigurationType::GetInstance();\
   std::string lang = conf->GetParameter<std::string>("OTB_LANG");\
-  setlocale( LC_ALL, lang.c_str() );\
+  setlocale( LC_MESSAGES, lang.c_str() );\
   bindtextdomain( "otb", QUOTEME(OTB_LANG_LOCATION) );\
   textdomain( "otb" );\
   std::cout << "Language: " << lang << std::endl;\
diff --git a/Examples/Tutorials/BasicApplication/Common/otbMsgReporterGUI.fl b/Examples/Tutorials/BasicApplication/Common/otbMsgReporterGUI.fl
index 38b6b65ca6e3ae95015a8cea18c3b51f13c6b875..6304b88a174e271078592409ff85bdb9a8366a2c 100644
--- a/Examples/Tutorials/BasicApplication/Common/otbMsgReporterGUI.fl
+++ b/Examples/Tutorials/BasicApplication/Common/otbMsgReporterGUI.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0110 
+version 1.0107 
 i18n_type 1 
 i18n_include "otbI18n.h" 
 i18n_function otbGetTextMacro 
diff --git a/Examples/Tutorials/BasicApplication/View/otbBasicApplicationViewGUI.fl b/Examples/Tutorials/BasicApplication/View/otbBasicApplicationViewGUI.fl
index 7e6dc9519b2656d32cebaa6de6acc370305f796f..add8291a70ac9d5f16b519af45164bb3303a9cd2 100644
--- a/Examples/Tutorials/BasicApplication/View/otbBasicApplicationViewGUI.fl
+++ b/Examples/Tutorials/BasicApplication/View/otbBasicApplicationViewGUI.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0110 
+version 1.0107 
 i18n_type 1 
 i18n_include "otbI18n.h" 
 i18n_function otbGetTextMacro 
diff --git a/Examples/Tutorials/CMakeLists.txt b/Examples/Tutorials/CMakeLists.txt
index 5bcb819c0dd83c9cdfaabfe2d1ccc5b4bdc94e72..3a456d7e4e0de4d0e7eaab851b1c4b39e8d0150e 100644
--- a/Examples/Tutorials/CMakeLists.txt
+++ b/Examples/Tutorials/CMakeLists.txt
@@ -23,7 +23,12 @@ IF(OTB_USE_VISU_GUI)
   ADD_EXECUTABLE(SimpleViewer SimpleViewer.cxx )
   TARGET_LINK_LIBRARIES(SimpleViewer OTBCommon OTBIO OTBGui OTBVisualization ${OTB_VISU_GUI_LIBRARIES})
 
-  SUBDIRS(BasicApplication)
+# The basic application tutorial makes use of the otbApplicationsCommon library which is built in OTB-Applications package.
+# Therefore this tutorial will not compile until we move the OTBApplcationsCommon lib to the OTB. Until then, 
+# the following line will be commented out.
+# SUBDIRS(BasicApplication)
+
+
 ENDIF(OTB_USE_VISU_GUI)
 
 ADD_EXECUTABLE(OrthoFusion OrthoFusion.cxx )