From 9b0668e1a2ef0c9b10f73ea2d7a2bddfdedb2275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 9 Nov 2002 00:48:46 +0000 Subject: [PATCH] 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 | 2 +- include/wx/image.h | 2 +- include/wx/string.h | 2 +- locale/cs.po | 2 +- locale/da.po | 2 +- locale/de.po | 2 +- locale/es.po | 2 +- locale/fi.po | 2 +- locale/fr.po | 2 +- locale/hu.po | 2 +- locale/id.po | 2 +- locale/it.po | 2 +- locale/nl.po | 2 +- locale/ru.po | 2 +- locale/sl.po | 2 +- locale/sv.po | 2 +- locale/tr.po | 2 +- locale/wxstd.po | 2 +- locale/zh.po | 2 +- src/common/image.cpp | 2 +- src/common/strconv.cpp | 2 +- src/gtk/bitmap.cpp | 4 ++-- src/gtk1/bitmap.cpp | 4 ++-- src/os2/bitmap.cpp | 2 +- utils/tex2rtf/src/makengui.nt | 2 +- 25 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/wx/encconv.h b/include/wx/encconv.h index 013b9d76bf..7b9589f355 100644 --- a/include/wx/encconv.h +++ b/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 diff --git a/include/wx/image.h b/include/wx/image.h index 01a46a0971..ea439aab62 100644 --- a/include/wx/image.h +++ b/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__ diff --git a/include/wx/string.h b/include/wx/string.h index c1bde0dcb5..559817da01 100644 --- a/include/wx/string.h +++ b/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 diff --git a/locale/cs.po b/locale/cs.po index 6cca297839..ae9774fa19 100644 --- a/locale/cs.po +++ b/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é sady '%s' nefunguje." #: ../src/generic/prntdlgg.cpp:193 diff --git a/locale/da.po b/locale/da.po index dfa2abbbb5..75c469f64a 100644 --- a/locale/da.po +++ b/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ćt '%s' virker ikke." #: ../src/generic/prntdlgg.cpp:193 diff --git a/locale/de.po b/locale/de.po index f2e898a3d2..2dfec67495 100644 --- a/locale/de.po +++ b/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 diff --git a/locale/es.po b/locale/es.po index acedb924a0..cd207d3b41 100644 --- a/locale/es.po +++ b/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 diff --git a/locale/fi.po b/locale/fi.po index adeba1775d..1726e4e38e 100644 --- a/locale/fi.po +++ b/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 diff --git a/locale/fr.po b/locale/fr.po index ea37d3d2b8..bd3a0b4a37 100644 --- a/locale/fr.po +++ b/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 diff --git a/locale/hu.po b/locale/hu.po index f517e12e43..c4671c8132 100644 --- a/locale/hu.po +++ b/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észletté alakítás nem működik." #: ../src/generic/prntdlgg.cpp:193 diff --git a/locale/id.po b/locale/id.po index c63eca4207..e2965b774e 100644 --- a/locale/id.po +++ b/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 diff --git a/locale/it.po b/locale/it.po index 6e54b08a80..c1fdfe321e 100644 --- a/locale/it.po +++ b/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 diff --git a/locale/nl.po b/locale/nl.po index 2ef19bfc42..10527ea030 100644 --- a/locale/nl.po +++ b/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 diff --git a/locale/ru.po b/locale/ru.po index d2585d04be..ad7bf08ef6 100644 --- a/locale/ru.po +++ b/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 diff --git a/locale/sl.po b/locale/sl.po index 67f706b912..b63fe5ecaf 100644 --- a/locale/sl.po +++ b/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 diff --git a/locale/sv.po b/locale/sv.po index 44662fd099..3880b1d393 100644 --- a/locale/sv.po +++ b/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ättning \"%s\" fungerar inte." #: ../src/generic/prntdlgg.cpp:193 diff --git a/locale/tr.po b/locale/tr.po index 3eb0b3b415..ca87aa573e 100644 --- a/locale/tr.po +++ b/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üţüm çalýţmýyor." #: ../src/generic/prntdlgg.cpp:194 diff --git a/locale/wxstd.po b/locale/wxstd.po index f714ae8909..d9be341542 100644 --- a/locale/wxstd.po +++ b/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 diff --git a/locale/zh.po b/locale/zh.po index 4f43f92c28..c18b75e08f 100644 --- a/locale/zh.po +++ b/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 diff --git a/src/common/image.cpp b/src/common/image.cpp index ce4619a9de..08b7f9c4d8 100644 --- a/src/common/image.cpp +++ b/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 diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index a14743d43d..25f6850245 100644 --- a/src/common/strconv.cpp +++ b/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 { diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp index 033071565e..d2e9fda7f0 100644 --- a/src/gtk/bitmap.cpp +++ b/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 { diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp index 033071565e..d2e9fda7f0 100644 --- a/src/gtk1/bitmap.cpp +++ b/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 { diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 8727225de8..76b31572f2 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -508,7 +508,7 @@ bool wxBitmap::SaveFile( // ---------------------------------------------------------------------------- -// wxImage-wxBitmap convertion +// wxImage-wxBitmap conversion // ---------------------------------------------------------------------------- bool wxBitmap::CreateFromImage ( diff --git a/utils/tex2rtf/src/makengui.nt b/utils/tex2rtf/src/makengui.nt index a4de8c23ca..4526561d62 100644 --- a/utils/tex2rtf/src/makengui.nt +++ b/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