Merge in from trunk r68684 - r69046

[wxWidgets.git] / docs / doxygen / overviews / nonenglish.h

diff --git a/docs/doxygen/overviews/nonenglish.h b/docs/doxygen/overviews/nonenglish.h
index b1b52d18cc1f220c384c1333ef2680fb0886dd66..3cd30380e4633f7f5c793dea928962d2f4b70770 100644 (file)
--- a/docs/doxygen/overviews/nonenglish.h
+++ b/docs/doxygen/overviews/nonenglish.h
@@ -3,10 +3,10 @@
 // Purpose:     topic overview
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     topic overview
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-/*!
+/**

 
 @page overview_nonenglish Writing Non-English Applications
 
 
 @page overview_nonenglish Writing Non-English Applications
 


@@ -102,9 +102,7 @@ Windows).
 How is this done? When you tell the wxLocale class to load a message catalog
 that contains a correct header, it checks the charset. The catalog is then
 converted to the charset used (see wxLocale::GetSystemEncoding and
 How is this done? When you tell the wxLocale class to load a message catalog
 that contains a correct header, it checks the charset. The catalog is then
 converted to the charset used (see wxLocale::GetSystemEncoding and

-wxLocale::GetSystemEncodingName) by the user's operating system. This is the
-default behaviour of the wxLocale class; you can disable it by @b not passing
-@c wxLOCALE_CONV_ENCODING to wxLocale::Init.
+wxLocale::GetSystemEncodingName) by the user's operating system.

 
 
 @section overview_nonenglish_strings Non-English Strings or 8-bit Characters in Source
 
 
 @section overview_nonenglish_strings Non-English Strings or 8-bit Characters in Source


@@ -123,7 +121,7 @@ English using message catalogs:
 @li Specify the source code language and charset as arguments to
     wxLocale::AddCatalog. For example:
     @code
 @li Specify the source code language and charset as arguments to
     wxLocale::AddCatalog. For example:
     @code

-    locale.AddCatalog(_T("myapp"), wxLANGUAGE_GERMAN, _T("iso-8859-1"));
+    locale.AddCatalog(wxT("myapp"), wxLANGUAGE_GERMAN, wxT("iso-8859-1"));

     @endcode
 
 
     @endcode