convertion --> conversion

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/encconv.h

@@ -62,7 +62,7 @@ class WXDLLEXPORT wxEncodingConverter : public wxObject
             wxEncodingConverter();
             ~wxEncodingConverter() { if (m_Table) delete[] m_Table; }
 
-            // Initialize convertion. Both output or input encoding may
+            // Initialize conversion. Both output or input encoding may
             // be wxFONTENCODING_UNICODE, but only if wxUSE_WCHAR_T is set to 1.
             //
             // All subsequent calls to Convert() will interpret it's argument

include/wx/image.h

@@ -121,7 +121,7 @@ public:
     wxImage( const wxImage* image );
 
 #if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
-    // convertion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
+    // conversion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
     wxImage( const wxBitmap &bitmap );
     wxBitmap ConvertToBitmap() const;
 #ifdef __WXGTK__

include/wx/string.h

@@ -470,7 +470,7 @@ public:
     const char *ToAscii() const { return c_str(); }
 #endif // Unicode/!Unicode
 
-    // conversions with (possible) format convertions: have to return a
+    // conversions with (possible) format conversions: have to return a
     // buffer with temporary data
     //
     // the functions defined (in either Unicode or ANSI) mode are mb_str() to

locale/cs.po

@@ -875,7 +875,7 @@ msgstr "Obsah"
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr "P<>evod do znakov<6F> sady '%s' nefunguje."
 
 #: ../src/generic/prntdlgg.cpp:193

locale/da.po

@@ -870,7 +870,7 @@ msgstr "Indhold"
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr "Konvertering til tegns<6E>t '%s' virker ikke."
 
 #: ../src/generic/prntdlgg.cpp:193

locale/de.po

@@ -877,7 +877,7 @@ msgstr "Inhalt"
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr ""
 
 #: ../src/generic/prntdlgg.cpp:193

locale/es.po

@@ -897,7 +897,7 @@ msgstr "Contenidos"
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr ""
 
 #: ../src/generic/prntdlgg.cpp:193

locale/fi.po

@@ -883,7 +883,7 @@ msgstr "Sis
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr ""
 
 #: ../src/generic/prntdlgg.cpp:193

locale/fr.po

@@ -890,7 +890,7 @@ msgstr "Table des mati
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr ""
 
 #: ../src/generic/prntdlgg.cpp:193

locale/hu.po

@@ -884,7 +884,7 @@ msgstr "Tartalom"
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr "A  '%s' jelk<6C>szlett<74> alak<61>t<EFBFBD>s nem m<>k<EFBFBD>dik."
 
 #: ../src/generic/prntdlgg.cpp:193

locale/id.po

@@ -886,7 +886,7 @@ msgstr "Isi"
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr "Konversi ke charset '%s' tidak bekerja"
 
 #: ../src/generic/prntdlgg.cpp:193

locale/it.po

@@ -874,7 +874,7 @@ msgstr "Sommario"
 
 #: ../src/common/strconv.cpp:593
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr "La conversione nella codifica '%s' non funziona."
 
 #: ../src/generic/prntdlgg.cpp:193

locale/nl.po

@@ -885,7 +885,7 @@ msgstr "Inhoud"
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr ""
 
 #: ../src/generic/prntdlgg.cpp:193

locale/ru.po

@@ -872,7 +872,7 @@ msgstr "
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr ""
 
 #: ../src/generic/prntdlgg.cpp:193

locale/sl.po

@@ -1156,7 +1156,7 @@ msgstr "Vsebina"
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr ""
 
 # generic/prntdlgg.cpp:196

locale/sv.po

@@ -884,7 +884,7 @@ msgstr "Inneh
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr "Konvertering till teckenupps<70>ttning \"%s\" fungerar inte."
 
 #: ../src/generic/prntdlgg.cpp:193

locale/tr.po

@@ -893,7 +893,7 @@ msgstr "
 
 #: ../src/common/strconv.cpp:608
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr "'%s' karakter k<>mesine d<>n<EFBFBD><6E><EFBFBD>m <20>al<61><6C>m<EFBFBD>yor."
 
 #: ../src/generic/prntdlgg.cpp:194

locale/wxstd.po

@@ -855,7 +855,7 @@ msgstr ""
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr ""
 
 #: ../src/generic/prntdlgg.cpp:193

locale/zh.po

@@ -880,7 +880,7 @@ msgstr "Ŀ¼"
 
 #: ../src/common/strconv.cpp:596
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr ""
 
 #: ../src/generic/prntdlgg.cpp:193

src/common/image.cpp

@@ -1346,7 +1346,7 @@ bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
 
 
 //-----------------------------------------------------------------------------
-// Deprecated wxBitmap convertion routines
+// Deprecated wxBitmap conversion routines
 //-----------------------------------------------------------------------------
 
 #if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI

src/common/strconv.cpp

@@ -610,7 +610,7 @@ IC_CharSet::IC_CharSet(const wxChar *name)
                 {
                     ms_wcCharsetName = NULL;
                     wxLogLastError(wxT("iconv"));
-                    wxLogError(_("Convertion to charset '%s' doesn't work."), name);
+                    wxLogError(_("Conversion to charset '%s' doesn't work."), name);
                 }
                 else
                 {

src/gtk/bitmap.cpp

@@ -344,7 +344,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     m_refData = new wxBitmapRefData();
 
     // ------
-    // convertion to mono bitmap:
+    // conversion to mono bitmap:
     // ------
     if (depth == 1)
     {
@@ -440,7 +440,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     }
 
     // ------
-    // convertion to colour bitmap:
+    // conversion to colour bitmap:
     // ------
     else
     {

src/gtk1/bitmap.cpp

@@ -344,7 +344,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     m_refData = new wxBitmapRefData();
 
     // ------
-    // convertion to mono bitmap:
+    // conversion to mono bitmap:
     // ------
     if (depth == 1)
     {
@@ -440,7 +440,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     }
 
     // ------
-    // convertion to colour bitmap:
+    // conversion to colour bitmap:
     // ------
     else
     {

src/os2/bitmap.cpp

@@ -508,7 +508,7 @@ bool wxBitmap::SaveFile(
 
 
 // ----------------------------------------------------------------------------
-// wxImage-wxBitmap convertion
+// wxImage-wxBitmap conversion
 // ----------------------------------------------------------------------------
 
 bool wxBitmap::CreateFromImage (

utils/tex2rtf/src/makengui.nt

@@ -11,7 +11,7 @@
 # of Tex2RTF, so I set off to give it a try...  I found out it would crash
 # when submitted to a certain LaTeX file I created.  I wanted to find out why,
 # so I went on and worked on compiling on my PC:  Windows NT 4.0 beta, Visual
-# C++ 4.1a.  Since all I was interested on was the convertion utility, I tried
+# C++ 4.1a.  Since all I was interested on was the conversion utility, I tried
 # to make it work without a GUI.  It didn't compile immediately, but after a
 # few small changes it now works like a charm.  Unfortunately it doesn't crash
 # anymore, so I can't tell why it used to...  Anyway, I wanted to contribute