From 5b5035ce5b432a4535a830debcb8ed26b7e1ec7b Mon Sep 17 00:00:00 2001 From: Kevin Hock Date: Thu, 6 Jan 2005 15:51:05 +0000 Subject: [PATCH 1/1] whilst -> while git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/docs/latex/fl/body.tex | 2 +- contrib/docs/latex/ogl/sample.tex | 2 +- contrib/src/deprecated/resource.cpp | 50 ++++++++++++++--------------- contrib/src/ogl/mfutils.cpp | 2 +- docs/latex/wx/dc.tex | 2 +- utils/tex2rtf/docs/tex2rtf.tex | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/contrib/docs/latex/fl/body.tex b/contrib/docs/latex/fl/body.tex index 0d3cac65f1..a900fd7dda 100644 --- a/contrib/docs/latex/fl/body.tex +++ b/contrib/docs/latex/fl/body.tex @@ -30,7 +30,7 @@ is given as the moving bar displaces other bars. Other features: the splitter bar shows a dotted thick line as it's dragged. Single-clicking on a row handle minimizes it to a horizontal tab which is given its own narrow row. This allows -the user to temporarily hide a row whilst allowing quick access +the user to temporarily hide a row while allowing quick access to it when required. A close button (x) hides a bar completely. You can get it back again diff --git a/contrib/docs/latex/ogl/sample.tex b/contrib/docs/latex/ogl/sample.tex index 4e0a437d39..da0c613256 100644 --- a/contrib/docs/latex/ogl/sample.tex +++ b/contrib/docs/latex/ogl/sample.tex @@ -63,7 +63,7 @@ copes with this by treating each arc deletion as a separate command, and sending Cut commands recursively, providing an undo path. Undoing such a Cut will only undo one command at a time - not a one to one correspondence with the original command - but it's a reasonable -compromise and preserves Do/Undo whilst keeping our DiagramCommand class +compromise and preserves Do/Undo while keeping our DiagramCommand class simple. \section{Possible enhancements} diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp index 0475a8d825..a2055edd7c 100644 --- a/contrib/src/deprecated/resource.cpp +++ b/contrib/src/deprecated/resource.cpp @@ -1837,7 +1837,7 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour wxChar buf[300]; wxStrcpy(buf, _("Found ")); wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30); - wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource.")); + wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource.")); wxLogWarning(buf); return false; } @@ -1845,28 +1845,28 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour // char if (!wxGetResourceToken(fd)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } if (strcmp(wxResourceBuffer, "char") != 0) { - wxLogWarning(_("Expected 'char' whilst parsing resource.")); + wxLogWarning(_("Expected 'char' while parsing resource.")); return false; } // *name if (!wxGetResourceToken(fd)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } if (wxResourceBuffer[0] != '*') { - wxLogWarning(_("Expected '*' whilst parsing resource.")); + wxLogWarning(_("Expected '*' while parsing resource.")); return false; } wxChar nameBuf[100]; @@ -1876,21 +1876,21 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour // = if (!wxGetResourceToken(fd)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } if (strcmp(wxResourceBuffer, "=") != 0) { - wxLogWarning(_("Expected '=' whilst parsing resource.")); + wxLogWarning(_("Expected '=' while parsing resource.")); return false; } // String if (!wxGetResourceToken(fd)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } @@ -1967,7 +1967,7 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, wxChar buf[300]; wxStrcpy(buf, _("Found ")); wxStrncat(buf, wxConvLibc.cMB2WX(wxResourceBuffer), 30); - wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource.")); + wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource.")); wxLogWarning(buf); return false; } @@ -1975,28 +1975,28 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, // char if (!wxGetResourceToken(fd)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } if (strcmp(wxResourceBuffer, "char") != 0) { - wxLogWarning(_("Expected 'char' whilst parsing resource.")); + wxLogWarning(_("Expected 'char' while parsing resource.")); return false; } // *name if (!wxGetResourceToken(fd)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } if (wxResourceBuffer[0] != '*') { - wxLogWarning(_("Expected '*' whilst parsing resource.")); + wxLogWarning(_("Expected '*' while parsing resource.")); return false; } char nameBuf[100]; @@ -2005,21 +2005,21 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, // = if (!wxGetResourceToken(fd)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } if (strcmp(wxResourceBuffer, "=") != 0) { - wxLogWarning(_("Expected '=' whilst parsing resource.")); + wxLogWarning(_("Expected '=' while parsing resource.")); return false; } // String if (!wxGetResourceToken(fd)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } @@ -2364,7 +2364,7 @@ long wxParseWindowStyle(const wxString& bitListString) } if (!found) { - wxLogWarning(_("Unrecognized style %s whilst parsing resource."), word); + wxLogWarning(_("Unrecognized style %s while parsing resource."), word); return 0; } word = wxResourceParseWord(WXSTRINGCAST bitListString, &i); @@ -3059,7 +3059,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR wxChar buf[300]; wxStrcpy(buf, _("Found ")); wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30); - wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource.")); + wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource.")); wxLogWarning(buf); return false; } @@ -3067,28 +3067,28 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR // char if (!wxGetResourceTokenString(s)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } if (strcmp(wxResourceBuffer, "char") != 0) { - wxLogWarning(_("Expected 'char' whilst parsing resource.")); + wxLogWarning(_("Expected 'char' while parsing resource.")); return false; } // *name if (!wxGetResourceTokenString(s)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } if (wxResourceBuffer[0] != '*') { - wxLogWarning(_("Expected '*' whilst parsing resource.")); + wxLogWarning(_("Expected '*' while parsing resource.")); return false; } wxChar nameBuf[100]; @@ -3098,21 +3098,21 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR // = if (!wxGetResourceTokenString(s)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } if (strcmp(wxResourceBuffer, "=") != 0) { - wxLogWarning(_("Expected '=' whilst parsing resource.")); + wxLogWarning(_("Expected '=' while parsing resource.")); return false; } // String if (!wxGetResourceTokenString(s)) { - wxLogWarning(_("Unexpected end of file whilst parsing resource.")); + wxLogWarning(_("Unexpected end of file while parsing resource.")); *eof = true; return false; } diff --git a/contrib/src/ogl/mfutils.cpp b/contrib/src/ogl/mfutils.cpp index 046a2164fd..e5fbccd33a 100644 --- a/contrib/src/ogl/mfutils.cpp +++ b/contrib/src/ogl/mfutils.cpp @@ -111,7 +111,7 @@ wxXMetaFile::wxXMetaFile(const wxChar *file) [3] | -> wxPen The handle table works as follows. - When a GDI object is created whilst reading in the + When a GDI object is created while reading in the metafile, the (e.g.) createpen record is added to the first free entry in the handle table. The createpen record's param1 is a pointer to the actual wxPen, and diff --git a/docs/latex/wx/dc.tex b/docs/latex/wx/dc.tex index febf46d150..ef70d00a79 100644 --- a/docs/latex/wx/dc.tex +++ b/docs/latex/wx/dc.tex @@ -1115,7 +1115,7 @@ Sets the user scaling factor, useful for applications which require \func{bool}{StartDoc}{\param{const wxString\& }{message}} Starts a document (only relevant when outputting to a printer). -Message is a message to show whilst printing. +Message is a message to show while printing. \membersection{wxDC::StartPage}\label{wxdcstartpage} diff --git a/utils/tex2rtf/docs/tex2rtf.tex b/utils/tex2rtf/docs/tex2rtf.tex index f62b6c3bb5..3e3696d4b1 100644 --- a/utils/tex2rtf/docs/tex2rtf.tex +++ b/utils/tex2rtf/docs/tex2rtf.tex @@ -3273,7 +3273,7 @@ system on the Internet. A typesetting language implemented as a set of \TeX\ macros. It is distinguished for allowing specification of the document structure, -whilst taking care of most layout concerns. It represents the opposite +while taking care of most layout concerns. It represents the opposite end of the spectrum from WYSIWYG word processors. \gloss{RTF}\label{rtf} -- 2.45.2