rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

25 files changed, 222 insertions, 222 deletions

diff --git a/tqtinterface/qt4/tools/linguist/LICENSE.GPL b/tqtinterface/qt4/tools/linguist/LICENSE.GPL
index 149f4ac..3221c03 100644
--- a/tqtinterface/qt4/tools/linguist/LICENSE.GPL
+++ b/tqtinterface/qt4/tools/linguist/LICENSE.GPL
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which tqcontains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions:
     stating that you changed the files and the date of any change.
 
     b) You must cause any work that you distribute or publish, that in
-    whole or in part tqcontains or is derived from the Program or any
+    whole or in part contains or is derived from the Program or any
     part thereof, to be licensed as a whole at no charge to all third
     parties under the terms of this License.
 
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf b/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf
index bdbdb5b..aa99e01 100644
--- a/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf
+++ b/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf
@@ -77,13 +77,13 @@ Usage: \c {lupdate myproject.pro}
   \index Qt Designer
 
 This is a simple command line tool. \l lupdate reads a Qt \c .pro
-project file, tqfinds the translatable strings in the specified source,
+project file, finds the translatable strings in the specified source,
 header and \e {Qt Designer} interface files, and produces or updates
 the \c .ts translation files listed in the project file. The
 translation files are given to the translator who uses \e {Qt
 Linguist} to read the files and insert the translations.
 
-Companies that have their own translators in-house may tqfind it useful
+Companies that have their own translators in-house may find it useful
 to run \l lupdate regularly, perhaps monthly, as the application
 develops. This will lead to a fairly low volume of translation work
 spread evenly over the life of the project and will allow the
@@ -134,5 +134,5 @@ validation, the original text will be used instead.
 \section1 Missing Translations
 
 Both \l lupdate and \l lrelease may be used with \c .ts translation
-source files which are incomplete. Missing translations will be tqreplaced
+source files which are incomplete. Missing translations will be replaced
 with the native language phrases at runtime.
diff --git a/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf b/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf
index a4dfa64..7cec631 100644
--- a/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf
+++ b/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf
@@ -157,7 +157,7 @@ Translations
 \index lupdate
 
 The \l lupdate program automatically provides a \e context for every
-source text. This context is the class name of the class that tqcontains
+source text. This context is the class name of the class that contains
 the \c tr() call. This is sufficient in the vast majority of cases.
 Sometimes however, the translator will need further information to
 uniquely identify a source text; for example, a dialog that contained
@@ -350,7 +350,7 @@ Creates a \l QTranslator object without a tqparent.
 \index tt1_la.qm
 
 Tries to load a file called \c tt1_la.qm (the \c .qm file extension is
-implicit) that tqcontains Latin translations for the source texts used in
+implicit) that contains Latin translations for the source texts used in
 the program. No error will occur if the file is not found.
 
 \index QApplication!installTranslator()
@@ -366,7 +366,7 @@ by the program.
 \printline hello
 
 Creates a push button that displays "Hello world!". If \c tt1_la.qm
-was found and tqcontains a translation for "Hello world!", the
+was found and contains a translation for "Hello world!", the
 translation appears; if not, the source text appears.
 
 \index tr()
@@ -394,7 +394,7 @@ is shown when we run the application:
 
 The first step is to create a project file, \c tt1.pro, that lists
 all the source files for the project. The project file can be a qmake
-project file, or even an ordinary makefile. Any file that tqcontains
+project file, or even an ordinary makefile. Any file that contains
 
 \index SOURCES!in Project Files
 \index TRANSLATIONS!in Project Files
@@ -539,12 +539,12 @@ This example is a slightly more involved and introduces a key
 \e {Qt Linguist} concept: "contexts".
 
 \list
-\i \c arrowpad.h tqcontains the definition of \c ArrowPad, a custom widget;
-\i \c arrowpad.cpp tqcontains the implementation of \c ArrowPad;
-\i \c mainwindow.h tqcontains the definition of \c MainWindow, a subclass of
+\i \c arrowpad.h contains the definition of \c ArrowPad, a custom widget;
+\i \c arrowpad.cpp contains the implementation of \c ArrowPad;
+\i \c mainwindow.h contains the definition of \c MainWindow, a subclass of
    \l QMainWindow
-\i \c mainwindow.cpp tqcontains the implementation of \c MainWindow;
-\i \c main.cpp tqcontains main().
+\i \c mainwindow.cpp contains the implementation of \c MainWindow;
+\i \c main.cpp contains main().
 \endlist
 
 \index tt2.pro
@@ -814,7 +814,7 @@ conflict between \e \&Bestand and \e \&Boven.
 \index Portuguese Language
 \index Brazilian Language
 
-We've included a translation file, \c tt3_pt.ts, which tqcontains some
+We've included a translation file, \c tt3_pt.ts, which contains some
 Portuguese translations for this example.
 
 \index Troll Print
@@ -834,11 +834,11 @@ Version 1.0 consists of these files:
 \index tt3_pt.ts
 
 \list
-\i \c printpanel.h tqcontains the definition of PrintPanel;
-\i \c printpanel.cpp tqcontains the implementation of PrintPanel;
-\i \c mainwindow.h tqcontains the definition of \c MainWindow;
-\i \c mainwindow.cpp tqcontains the implementation of \c MainWindow;
-\i \c main.cpp tqcontains main();
+\i \c printpanel.h contains the definition of PrintPanel;
+\i \c printpanel.cpp contains the implementation of PrintPanel;
+\i \c mainwindow.h contains the definition of \c MainWindow;
+\i \c mainwindow.cpp contains the implementation of \c MainWindow;
+\i \c main.cpp contains main();
 \i \c tt3.pro is the \e qmake project file.
 \i \c tt3_pt.ts is the Portuguese message file.
 \endlist
@@ -893,7 +893,7 @@ translation shortly.
 
 \index MainWindow!in Translation Tutorial
 
-The header file for \c MainWindow, \c mainwindow.h, tqcontains no
+The header file for \c MainWindow, \c mainwindow.h, contains no
 surprises. In the implementation, \c mainwindow.cpp, we have some
 user-visible source texts that must be marked for translation.
 
@@ -976,10 +976,10 @@ for the second pair of radio buttons:
 Now run \l lupdate and open \c tt3_pt.ts with \e {Qt Linguist}. You
 should now see two changes.
 
-First, the translation source file now tqcontains \e three "Enabled",
+First, the translation source file now contains \e three "Enabled",
 "Disabled" pairs. The first pair is marked "(obs.)" signifying that they
 are obsolete. This is because these texts appeared in \c tr() calls that
-have been tqreplaced by new calls with two arguments. The second pair has
+have been replaced by new calls with two arguments. The second pair has
 "two-sided" as their comment, and the third pair has "colors" as their
 comment. The comments are shown in the \e {Source text and comments}
 area in \e {Qt Linguist}.
@@ -1013,9 +1013,9 @@ the translator.
 \index Comments!for Translators
 
 An additional way of helping the translator is to provide information on
-how to navigate to the particular part of the application that tqcontains
+how to navigate to the particular part of the application that contains
 the source texts they must translate. This helps them see the context
-in which the translation appears and also helps them to tqfind and test
+in which the translation appears and also helps them to find and test
 the translations. This can be achieved by using a \e TRANSLATOR comment
 in the source code:
 \code
@@ -1036,7 +1036,7 @@ You should see the comments in the \e {Source text and comments} area
 as you browse through the list of source texts.
 
 Sometimes, particularly with large programs, it can be difficult for
-the translator to tqfind their translations and check that they're
+the translator to find their translations and check that they're
 correct. Comments that provide good navigation information can save
 them time:
 
diff --git a/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf b/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf
index 572c903..7a71b6a 100644
--- a/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf
+++ b/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf
@@ -21,7 +21,7 @@ choose \Menu File|Open from the menu bar and select a \c .ts
 translation source file to work on.
 
 \e {Qt Linguist}'s main window is divided into four main areas. The
-left hand side tqcontains the Context list, the top right is the Source
+left hand side contains the Context list, the top right is the Source
 text area, the middle right is the translation area and the bottom
 right is the phrases and guesses area. We'll describe them in detail
 later.
@@ -86,7 +86,7 @@ The second column 'Source text' shows the text that must be translated.
 The third column shows the translation.
 
 \e{Qt Linguist} provides three kinds of validation: accelerator,
-punctuation and phrase. If the source text tqcontains an accelerator
+punctuation and phrase. If the source text contains an accelerator
 i.e. an ampersand, '\&' and the translated text does not contain an
 ampersand the translation will fail the accelerator validation.
 Similarly, if the source text ends with a particular punctuation
@@ -103,7 +103,7 @@ The Source Text Area is a dockable window.
 This area appears at the middle right of the main window by default. It
 is comprised of three vertical sections. The first section is labelled
 'Source text' below which the source text appears. The second section
-tqcontains contextual information on a light blue background that the
+contains contextual information on a light blue background that the
 programmer has added to assist the translator. If no contextual
 information has been given this section does not appear. The third
 section is labelled 'Translation' and this is where you enter the
@@ -227,13 +227,13 @@ Some phrases contain variables. Variables are placeholders for items of
 text that are filled in at runtime. They are signified in the source
 text with a percent sign followed by a digit, e.g. \e {After processing
 file %1, file %2 is next in line}. In this example, \c %1 will be
-tqreplaced at runtime with the name of the first file to be processed and
+replaced at runtime with the name of the first file to be processed and
 \c %2 with the name of the next file to be processed. In the translated
 version the variables must still appear. For example a German
 translation might reverse the phrases, e.g. \e {Datei %2 wird
 bearbeitet, wenn. Datei %1 fertig ist}. Note that both variables
 are still used but their order has changed. The order in which variables
-appear does not matter; \c %1 will always be tqreplaced by the same text
+appear does not matter; \c %1 will always be replaced by the same text
 at runtime no matter where it appears in the source text or translation
 and similarly \c %2, etc.
 
@@ -292,7 +292,7 @@ button (press Esc) once you've finished adding (and removing) phrases.
 
 When a phrase or set of phrases appears in the phrase book double
 clicking the required target phrase will copy it to the translation
-pane at the text cursor position. If you want to \e tqreplace the text
+pane at the text cursor position. If you want to \e replace the text
 in the translation pane with the target phrase, click the translation
 pane, choose \Menu {Edit|Select All} (press \Key Alt+A) and then
 double click the target phrase.
@@ -412,7 +412,7 @@ number of projects and applications.
     \link {The Find Dialog} Find dialog \endlink. When the dialog pops up
     enter the text to be found and click the \e {Find Next} button.
     Source phrases, translations and comments may be searched.
-    \i \e {Find Next F3} \BR tqfinds the next occurrence of the text that
+    \i \e {Find Next F3} \BR finds the next occurrence of the text that
     was last entered in the Find dialog.
     \endlist
 
@@ -566,7 +566,7 @@ Toggles phrase book validation on or off.
 
 \section2 The Find Dialog
 
-\img tqfinddialog.png
+\img finddialog.png
 \caption The Find Dialog
 
 Choose \Menu Edit|Find from the menu bar or press \Key Ctrl+F to pop
diff --git a/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp b/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp
index 6dc876c..fe8129a 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp
+++ b/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp
@@ -46,60 +46,60 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name,
+FindDialog::FindDialog( bool replace, TQWidget *tqparent, const char *name,
 			bool modal )
     : TQDialog( tqparent, name, modal )
 {
     sourceText = 0;
     
-    led = new TQLineEdit( this, "tqfind line edit" );
-    TQLabel *tqfindWhat = new TQLabel( led, tr("Fi&nd what:"), this, "tqfind what" );
-    TQLabel *tqreplaceWith = 0;
-    TQPushButton *tqfindNxt = new TQPushButton( tr("&Find Next"), this,
-					    "tqfind next" );
-    tqfindNxt->setDefault( TRUE );
-    connect( tqfindNxt, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitFindNext()) );
-    TQPushButton *cancel = new TQPushButton( tr("Cancel"), this, "cancel tqfind" );
+    led = new TQLineEdit( this, "find line edit" );
+    TQLabel *findWhat = new TQLabel( led, tr("Fi&nd what:"), this, "find what" );
+    TQLabel *replaceWith = 0;
+    TQPushButton *findNxt = new TQPushButton( tr("&Find Next"), this,
+					    "find next" );
+    findNxt->setDefault( TRUE );
+    connect( findNxt, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitFindNext()) );
+    TQPushButton *cancel = new TQPushButton( tr("Cancel"), this, "cancel find" );
     connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
 
-    TQVBoxLayout *bl = new TQVBoxLayout( 6, "tqfind button tqlayout" );
-    bl->addWidget( tqfindNxt );
+    TQVBoxLayout *bl = new TQVBoxLayout( 6, "find button tqlayout" );
+    bl->addWidget( findNxt );
 
-    matchCase = new TQCheckBox( tr("&Match case"), this, "tqfind match case" );
+    matchCase = new TQCheckBox( tr("&Match case"), this, "find match case" );
     matchCase->setChecked( FALSE );
 
-    if ( tqreplace ) {
-	TQWhatsThis::add( this, tr("This window allows you to search and tqreplace"
+    if ( replace ) {
+	TQWhatsThis::add( this, tr("This window allows you to search and replace"
 				  " some text in the translations.") );
 
-	red = new TQLineEdit( this, "tqreplace line edit" );
-	tqreplaceWith = new TQLabel( red, tr("Replace &with:"), this,
-				  "tqreplace with" );
+	red = new TQLineEdit( this, "replace line edit" );
+	replaceWith = new TQLabel( red, tr("Replace &with:"), this,
+				  "replace with" );
 	setTabOrder( led, red );
 
-	TQPushButton *tqreplace = new TQPushButton( tr("&Replace"), this,
-						"tqreplace" );
-	connect( tqreplace, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplace()) );
-	TQPushButton *tqreplaceAll = new TQPushButton( tr("Replace &All"), this,
-						   "tqreplace all" );
-	connect( tqreplaceAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplaceAll()) );
-	setTabOrder( tqfindNxt, tqreplace );
-	setTabOrder( tqreplace, tqreplaceAll );
-	setTabOrder( tqreplaceAll, cancel );
-
-	TQWhatsThis::add( tqreplace, tr("Click here to tqreplace the next occurrence"
+	TQPushButton *replace = new TQPushButton( tr("&Replace"), this,
+						"replace" );
+	connect( replace, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplace()) );
+	TQPushButton *replaceAll = new TQPushButton( tr("Replace &All"), this,
+						   "replace all" );
+	connect( replaceAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplaceAll()) );
+	setTabOrder( findNxt, replace );
+	setTabOrder( replace, replaceAll );
+	setTabOrder( replaceAll, cancel );
+
+	TQWhatsThis::add( replace, tr("Click here to replace the next occurrence"
 				     " of the text you typed in.") );
-	TQWhatsThis::add( tqreplaceAll, tr("Click here to tqreplace all occurrences"
+	TQWhatsThis::add( replaceAll, tr("Click here to replace all occurrences"
 					" of the text you typed in.") );
 
-	bl->addWidget( tqreplace );
-	bl->addWidget( tqreplaceAll );
+	bl->addWidget( replace );
+	bl->addWidget( replaceAll );
 
 	TQGridLayout *gl = new TQGridLayout( this, 4, 3, 11, 11,
-					   "tqfind outer tqlayout" );
-	gl->addWidget( tqfindWhat, 0, 0 );
+					   "find outer tqlayout" );
+	gl->addWidget( findWhat, 0, 0 );
 	gl->addWidget( led, 0, 1 );
-	gl->addWidget( tqreplaceWith, 1, 0 );
+	gl->addWidget( replaceWith, 1, 0 );
 	gl->addWidget( red, 1, 1 );
 	gl->addMultiCellWidget( matchCase, 2, 2, 0, 1 );
 	gl->addMultiCell( bl, 0, 3, 3, 3 );
@@ -108,12 +108,12 @@ FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name,
 				  " text in the translation source file.") );
 
 	sourceText = new TQCheckBox( tr("&Source texts"), this,
-				    "tqfind in source texts" );
+				    "find in source texts" );
 	sourceText->setChecked( TRUE );
 	translations = new TQCheckBox( tr("&Translations"), this,
-				      "tqfind in translations" );
+				      "find in translations" );
 	translations->setChecked( TRUE );
-	comments = new TQCheckBox( tr("&Comments"), this, "tqfind in comments" );
+	comments = new TQCheckBox( tr("&Comments"), this, "find in comments" );
 	comments->setChecked( TRUE );
 
 	TQWhatsThis::add( sourceText, tr("Source texts are searched when"
@@ -123,11 +123,11 @@ FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name,
 	TQWhatsThis::add( comments, tr("Comments and contexts are searched when"
 				      " checked.") );
 
-	TQVBoxLayout *cl = new TQVBoxLayout( 6, "tqfind checkbox tqlayout" );
+	TQVBoxLayout *cl = new TQVBoxLayout( 6, "find checkbox tqlayout" );
 
 	TQGridLayout *gl = new TQGridLayout( this, 3, 4, 11, 11,
-					   "tqfind outer tqlayout" );
-	gl->addWidget( tqfindWhat, 0, 0 );
+					   "find outer tqlayout" );
+	gl->addWidget( findWhat, 0, 0 );
 	gl->addMultiCellWidget( led, 0, 0, 1, 2 );
 	gl->addWidget( matchCase, 1, 2 );
 	gl->addMultiCell( bl, 0, 2, 3, 3 );
@@ -147,7 +147,7 @@ FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name,
 
     TQWhatsThis::add( matchCase, tr("Texts such as 'TeX' and 'tex' are"
 				   " considered as different when checked.") );
-    TQWhatsThis::add( tqfindNxt, tr("Click here to tqfind the next occurrence of the"
+    TQWhatsThis::add( findNxt, tr("Click here to find the next occurrence of the"
 				 " text you typed in.") );
     TQWhatsThis::add( cancel, tr("Click here to close this window.") );
 
@@ -169,15 +169,15 @@ void FindDialog::emitFindNext()
 		( comments->isChecked() ? Comments : 0 );
     else
 	where = Translations;
-    emit tqfindNext( led->text(), where, matchCase->isChecked() );
+    emit findNext( led->text(), where, matchCase->isChecked() );
 }
 
 void FindDialog::emitReplace()
 {
-    emit tqreplace( led->text(), red->text(), matchCase->isChecked(), FALSE );
+    emit replace( led->text(), red->text(), matchCase->isChecked(), FALSE );
 }
 
 void FindDialog::emitReplaceAll()
 {
-    emit tqreplace( led->text(), red->text(), matchCase->isChecked(), TRUE );
+    emit replace( led->text(), red->text(), matchCase->isChecked(), TRUE );
 }
diff --git a/tqtinterface/qt4/tools/linguist/linguist/finddialog.h b/tqtinterface/qt4/tools/linguist/linguist/finddialog.h
index 2cf8e43..47d0ec5 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/finddialog.h
+++ b/tqtinterface/qt4/tools/linguist/linguist/finddialog.h
@@ -46,11 +46,11 @@ class FindDialog : public TQDialog
 public:
     enum { SourceText = 0x1, Translations = 0x2, Comments = 0x4 };
 
-    FindDialog( bool tqreplace, TQWidget *tqparent = 0, const char *name = 0, bool modal = FALSE );
+    FindDialog( bool replace, TQWidget *tqparent = 0, const char *name = 0, bool modal = FALSE );
 
 Q_SIGNALS:
-    void tqfindNext( const TQString& text, int where, bool matchCase );
-    void tqreplace( const TQString& before, const TQString& after, bool matchCase, bool all );
+    void findNext( const TQString& text, int where, bool matchCase );
+    void replace( const TQString& before, const TQString& after, bool matchCase, bool all );
 
 private Q_SLOTS:
     void emitFindNext();
diff --git a/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts b/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts
index 31e6737..2c7708b 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts
+++ b/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts
@@ -50,7 +50,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This window allows you to search and tqreplace some text in the translations.</source>
+        <source>This window allows you to search and replace some text in the translations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -66,11 +66,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to tqreplace the next occurrence of the text you typed in.</source>
+        <source>Click here to replace the next occurrence of the text you typed in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to tqreplace all occurrences of the text you typed in.</source>
+        <source>Click here to replace all occurrences of the text you typed in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -110,7 +110,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to tqfind the next occurrence of the text you typed in.</source>
+        <source>Click here to find the next occurrence of the text you typed in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -413,7 +413,7 @@ All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot tqfind the string &apos;%1&apos;.</source>
+        <source>Cannot find the string &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -774,7 +774,7 @@ All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search for some text in the translation source file and tqreplace it by another text.</source>
+        <source>Search for some text in the translation source file and replace it by another text.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts b/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts
index 31e6737..2c7708b 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts
+++ b/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts
@@ -50,7 +50,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This window allows you to search and tqreplace some text in the translations.</source>
+        <source>This window allows you to search and replace some text in the translations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -66,11 +66,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to tqreplace the next occurrence of the text you typed in.</source>
+        <source>Click here to replace the next occurrence of the text you typed in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to tqreplace all occurrences of the text you typed in.</source>
+        <source>Click here to replace all occurrences of the text you typed in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -110,7 +110,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click here to tqfind the next occurrence of the text you typed in.</source>
+        <source>Click here to find the next occurrence of the text you typed in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -413,7 +413,7 @@ All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot tqfind the string &apos;%1&apos;.</source>
+        <source>Cannot find the string &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -774,7 +774,7 @@ All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search for some text in the translation source file and tqreplace it by another text.</source>
+        <source>Search for some text in the translation source file and replace it by another text.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp b/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp
index 5c298b2..5c3c747 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp
+++ b/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp
@@ -109,12 +109,12 @@ int LVI::compare( TQListViewItem *other, int column, bool ascending ) const
     TQString thisKey = key( column, ascending );
     TQString otherKey = other->key( column, ascending );
 
-    if ( thisKey.tqcontains('&') || otherKey.tqcontains('&') ) {
+    if ( thisKey.contains('&') || otherKey.contains('&') ) {
 	TQString nicerThisKey = thisKey;
 	TQString nicerOtherKey = otherKey;
 
-	nicerThisKey.tqreplace( "&", "" );
-	nicerOtherKey.tqreplace( "&", "" );
+	nicerThisKey.replace( "&", "" );
+	nicerOtherKey.replace( "&", "" );
 
 	int delta = nicerThisKey.localeAwareCompare( nicerOtherKey );
 	if ( delta != 0 )
diff --git a/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp b/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp
index 744cd16..5e29875 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp
+++ b/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp
@@ -195,7 +195,7 @@ void ShadowWidget::paintEvent( TQPaintEvent * e )
 /*
    EditorPage class impl.
 
-   A frame that tqcontains the source text, translated text and any
+   A frame that contains the source text, translated text and any
    source code comments and hints.
 */
 EditorPage::EditorPage( TQWidget * tqparent, const char * name )
diff --git a/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp b/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp
index 95b4fc2..c38e9e0 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp
+++ b/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp
@@ -44,11 +44,11 @@
 static TQString protect( const TQString& str )
 {
     TQString p = str;
-    p.tqreplace( "&", "&amp;" );
-    p.tqreplace( "\"", "&quot;" );
-    p.tqreplace( ">", "&gt;" );
-    p.tqreplace( "<", "&lt;" );
-    p.tqreplace( "'", "&apos;" );
+    p.replace( "&", "&amp;" );
+    p.replace( "\"", "&quot;" );
+    p.replace( ">", "&gt;" );
+    p.replace( "<", "&lt;" );
+    p.replace( "'", "&apos;" );
     return p;
 }
 
diff --git a/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp b/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp
index 2d13965..9d78cf7 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp
+++ b/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp
@@ -206,7 +206,7 @@ CandidateList similarTextHeuristicCandidates( const MetaTranslator *tor,
 	int delta = TQABS( (int) s.length() - targetLen );
 
 	/*
-	  Here is the score formula. A comment above tqcontains a
+	  Here is the score formula. A comment above contains a
 	  discussion on a similar (but simpler) formula.
 	*/
 	int score = ( (intersection(cm, cmTarget).worth() + 1) << 10 ) /
diff --git a/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp b/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp
index 8ebc932..564845f 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp
+++ b/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp
@@ -290,12 +290,12 @@ TrWindow::TrWindow()
 
     phraseBooks.setAutoDelete( TRUE );
 
-    f = new FindDialog( FALSE, this, "tqfind", FALSE );
+    f = new FindDialog( FALSE, this, "find", FALSE );
     f->setCaption( tqtr("TQt Linguist") );
-    h = new FindDialog( TRUE, this, "tqreplace", FALSE );
+    h = new FindDialog( TRUE, this, "replace", FALSE );
     h->setCaption( tqtr("TQt Linguist") );
-    tqfindMatchCase = FALSE;
-    tqfindWhere = 0;
+    findMatchCase = FALSE;
+    findWhere = 0;
     foundItem = 0;
     foundScope = 0;
     foundWhere = 0;
@@ -320,8 +320,8 @@ TrWindow::TrWindow()
     connect( me, TQT_SIGNAL(nextUnfinished()), this, TQT_SLOT(nextUnfinished()) );
     connect( me, TQT_SIGNAL(focusSourceList()), this, TQT_SLOT(focusSourceList()) );
     connect( me, TQT_SIGNAL(focusPhraseList()), this, TQT_SLOT(focusPhraseList()) );
-    connect( f, TQT_SIGNAL(tqfindNext(const TQString&, int, bool)),
-	     this, TQT_SLOT(tqfindNext(const TQString&, int, bool)) );
+    connect( f, TQT_SIGNAL(findNext(const TQString&, int, bool)),
+	     this, TQT_SLOT(findNext(const TQString&, int, bool)) );
 
     TQWhatsThis::add( lv, tqtr("This panel lists the source contexts.") );
 
@@ -378,7 +378,7 @@ void TrWindow::openFile( const TQString& name )
 	    srcCharsSpc = 0;
 	    for ( it = all.begin(); it != all.end(); ++it ) {
 		tqApp->processEvents();
-		ContextLVI *c = contexts.tqfind( TQString((*it).context()) );
+		ContextLVI *c = contexts.find( TQString((*it).context()) );
 		if ( c == 0 ) {
 		    c = new ContextLVI( lv, tor.toUnicode((*it).context(),
 							  (*it).utf8()) );
@@ -434,10 +434,10 @@ void TrWindow::openFile( const TQString& name )
 	    foundWhere = 0;
 	    foundOffset = 0;
 	    if ( lv->childCount() > 0 ) {
-		tqfindAct->setEnabled( TRUE );
-		tqfindAgainAct->setEnabled( FALSE );
+		findAct->setEnabled( TRUE );
+		findAgainAct->setEnabled( FALSE );
 #ifdef notyet
-		tqreplaceAct->setEnabled( TRUE );
+		replaceAct->setEnabled( TRUE );
 #endif
 		lv->setCurrentItem( lv->firstChild() );
 	    }
@@ -493,7 +493,7 @@ void TrWindow::saveAs()
 void TrWindow::release()
 {
     TQString newFilename = filename;
-    newFilename.tqreplace( TQRegExp(".ts$"), "" );
+    newFilename.replace( TQRegExp(".ts$"), "" );
     newFilename += TQString( ".qm" );
 
     newFilename = TQFileDialog::getSaveFileName( newFilename,
@@ -580,7 +580,7 @@ void TrWindow::print()
     }
 }
 
-void TrWindow::tqfind()
+void TrWindow::find()
 {
     h->hide();
     f->show();
@@ -588,7 +588,7 @@ void TrWindow::tqfind()
     f->raise();
 }
 
-void TrWindow::tqfindAgain()
+void TrWindow::findAgain()
 {
     int pass = 0;
     int oldItemNo = itemToIndex( slv, slv->currentItem() );
@@ -685,13 +685,13 @@ void TrWindow::tqfindAgain()
     slv->triggerUpdate();
     tqApp->beep();
     TQMessageBox::warning( this, tqtr("TQt Linguist"),
-			  TQString( tqtr("Cannot tqfind the string '%1'.") ).arg(tqfindText) );
+			  TQString( tqtr("Cannot find the string '%1'.") ).arg(findText) );
     foundItem   = 0;
     foundWhere  = 0;
     foundOffset = 0;
 }
 
-void TrWindow::tqreplace()
+void TrWindow::replace()
 {
     f->hide();
     h->show();
@@ -729,8 +729,8 @@ TQListViewItem * TrWindow::indexToItem( TQListView * view, int index )
 bool TrWindow::searchItem( const TQString & searchWhat, TQListViewItem * j,
 			   TQListViewItem * k )
 {
-    if ( (tqfindWhere & foundWhere) != 0 ) {
-	foundOffset = searchWhat.tqfind( tqfindText, foundOffset, tqfindMatchCase );
+    if ( (findWhere & foundWhere) != 0 ) {
+	foundOffset = searchWhat.find( findText, foundOffset, findMatchCase );
 	if ( foundOffset >= 0 ) {
 	    foundItem = itemToIndex( slv, k );
 	    foundScope = j;
@@ -776,7 +776,7 @@ void TrWindow::openPhraseBook()
 	   "All files (*)"),
 	this, "open_phrasebook",
 	tqtr("Open Phrase Book") );
-    if ( !name.isEmpty() && !phraseBookNames.tqcontains(name) ) {
+    if ( !name.isEmpty() && !phraseBookNames.contains(name) ) {
 	if ( openPhraseBook(name) ) {
 	    int n = (int)(phraseBooks.at( phraseBooks.count() - 1 )->count());
 	    statusBar()->message( tqtr("%1 phrase(s) loaded.").arg(n),
@@ -958,7 +958,7 @@ void TrWindow::showNewScope( TQListViewItem *item )
 
 	// Make sure that we update the source text and translation text. Use the first message in the new scope.
 	setCurrentMessageItem(slv->firstChild());
-	// This must be explicitly called since the signal is not emitted if the context only tqcontains one item
+	// This must be explicitly called since the signal is not emitted if the context only contains one item
 	showNewCurrent(slv->firstChild());
 	slv->viewport()->setUpdatesEnabled( upe );
 	slv->setUpdatesEnabled( upe );
@@ -1342,15 +1342,15 @@ void TrWindow::next()
 }
 
 
-void TrWindow::tqfindNext( const TQString& text, int where, bool matchCase )
+void TrWindow::findNext( const TQString& text, int where, bool matchCase )
 {
-    tqfindText = text;
-    if ( tqfindText.isEmpty() )
-	tqfindText = TQString( "magicwordthatyoushouldavoid" );
-    tqfindWhere = where;
-    tqfindMatchCase = matchCase;
-    tqfindAgainAct->setEnabled( TRUE );
-    tqfindAgain();
+    findText = text;
+    if ( findText.isEmpty() )
+	findText = TQString( "magicwordthatyoushouldavoid" );
+    findWhere = where;
+    findMatchCase = matchCase;
+    findAgainAct->setEnabled( TRUE );
+    findAgain();
 }
 
 void TrWindow::revalidate()
@@ -1384,8 +1384,8 @@ void TrWindow::revalidate()
 TQString TrWindow::friendlyString( const TQString& str )
 {
     TQString f = str.lower();
-    f.tqreplace( TQRegExp(TQString("[.,:;!?()-]")), TQString(" ") );
-    f.tqreplace( "&", TQString("") );
+    f.replace( TQRegExp(TQString("[.,:;!?()-]")), TQString(" ") );
+    f.replace( "&", TQString("") );
     f = f.simplifyWhiteSpace();
     f = f.lower();
     return f;
@@ -1478,16 +1478,16 @@ void TrWindow::setupMenuBar()
 			       TQString(), TQAccel::stringToKey(tqtr("Ctrl+A")) );
     selectAllAct->setEnabled( FALSE );
     editp->insertSeparator();
-    tqfindAct = new Action( editp, tqtr("&Find..."), TQT_TQOBJECT(this), TQT_SLOT(tqfind()),
+    findAct = new Action( editp, tqtr("&Find..."), TQT_TQOBJECT(this), TQT_SLOT(find()),
 			  "searchfind.png", TQAccel::stringToKey(tqtr("Ctrl+F")) );
-    tqfindAct->setEnabled( FALSE );
-    tqfindAgainAct = new Action( editp, tqtr("Find &Next"),
-			       TQT_TQOBJECT(this), TQT_SLOT(tqfindAgain()), TQString(), Qt::Key_F3 );
-    tqfindAgainAct->setEnabled( FALSE );
+    findAct->setEnabled( FALSE );
+    findAgainAct = new Action( editp, tqtr("Find &Next"),
+			       TQT_TQOBJECT(this), TQT_SLOT(findAgain()), TQString(), Qt::Key_F3 );
+    findAgainAct->setEnabled( FALSE );
 #ifdef notyet
-    tqreplaceAct = new Action( editp, tqtr("&Replace..."), TQT_TQOBJECT(this), TQT_SLOT(tqreplace()),
+    replaceAct = new Action( editp, tqtr("&Replace..."), TQT_TQOBJECT(this), TQT_SLOT(replace()),
 			     TQAccel::stringToKey(tqtr("Ctrl+H")) );
-    tqreplaceAct->setEnabled( FALSE );
+    replaceAct->setEnabled( FALSE );
 #endif
 
     // Translation menu
@@ -1591,12 +1591,12 @@ void TrWindow::setupMenuBar()
     pasteAct->setWhatsThis( tqtr("Paste the clipboard text into the"
 			       " translation.") );
     selectAllAct->setWhatsThis( tqtr("Select the whole translation text.") );
-    tqfindAct->setWhatsThis( tqtr("Search for some text in the translation "
+    findAct->setWhatsThis( tqtr("Search for some text in the translation "
 				"source file.") );
-    tqfindAgainAct->setWhatsThis( tqtr("Continue the search where it was left.") );
+    findAgainAct->setWhatsThis( tqtr("Continue the search where it was left.") );
 #ifdef notyet
-    tqreplaceAct->setWhatsThis( tqtr("Search for some text in the translation"
-				 " source file and tqreplace it by another"
+    replaceAct->setWhatsThis( tqtr("Search for some text in the translation"
+				 " source file and replace it by another"
 				 " text.") );
 #endif
 
@@ -1654,13 +1654,13 @@ void TrWindow::setupToolBars()
     copyAct->addToToolbar( editt, tqtr("Copy") );
     pasteAct->addToToolbar( editt, tqtr("Paste") );
     editt->addSeparator();
-    tqfindAct->addToToolbar( editt, tqtr("Find") );
+    findAct->addToToolbar( editt, tqtr("Find") );
 #ifdef notyet
-    tqreplaceAct->addToToolbar( editt, tqtr("Replace") );
+    replaceAct->addToToolbar( editt, tqtr("Replace") );
 #endif
 
     // beginFromSourceAct->addToToolbar( translationst,
-    //                                tqtr("Begin from Source"), "searchtqfind" );
+    //                                tqtr("Begin from Source"), "searchfind" );
     prevAct->addToToolbar( translationst, tqtr("Prev") );
     nextAct->addToToolbar( translationst, tqtr("Next") );
     prevUnfinishedAct->addToToolbar( translationst, tqtr("Prev Unfinished") );
@@ -1718,7 +1718,7 @@ bool TrWindow::openPhraseBook( const TQString& name )
 
 bool TrWindow::savePhraseBook( TQString& name, const PhraseBook& pb )
 {
-    if ( !name.tqcontains( ".qph" ) && !name.tqcontains(".") )
+    if ( !name.contains( ".qph" ) && !name.contains(".") )
 	name += ".qph";
 
     if ( !pb.save(name) ) {
@@ -1754,7 +1754,7 @@ void TrWindow::updatePhraseDict()
 	    TQString f = friendlyString( (*p).source() );
 	    if ( f.length() > 0 ) {
 		f = TQStringList::split( TQChar(' '), f ).first();
-		ent = phraseDict.tqfind( f );
+		ent = phraseDict.find( f );
 		if ( ent == 0 ) {
 		    ent = new PhraseBook;
 		    phraseDict.insert( f, ent );
@@ -1776,10 +1776,10 @@ PhraseBook TrWindow::getPhrases( const TQString& source )
     PhraseBook::Iterator p;
 
     for ( w = lookupWords.begin(); w != lookupWords.end(); ++w ) {
-	PhraseBook *ent = phraseDict.tqfind( *w );
+	PhraseBook *ent = phraseDict.find( *w );
 	if ( ent != 0 ) {
 	    for ( p = ent->begin(); p != ent->end(); ++p ) {
-		if ( f.tqfind(friendlyString((*p).source())) >= 0 )
+		if ( f.find(friendlyString((*p).source())) >= 0 )
 		    phrases.append( *p );
 	    }
 	}
@@ -1822,11 +1822,11 @@ bool TrWindow::danger( const TQString& source, const TQString& translation,
 	PhraseBook::Iterator p;
 
 	for ( w = lookupWords.begin(); w != lookupWords.end(); ++w ) {
-	    PhraseBook *ent = phraseDict.tqfind( *w );
+	    PhraseBook *ent = phraseDict.find( *w );
 	    if ( ent != 0 ) {
 		for ( p = ent->begin(); p != ent->end(); ++p ) {
-		    if ( fsource.tqfind(friendlyString((*p).source())) < 0 ||
-			 ftranslation.tqfind(friendlyString((*p).target())) >= 0 )
+		    if ( fsource.find(friendlyString((*p).source())) < 0 ||
+			 ftranslation.find(friendlyString((*p).target())) >= 0 )
 			break;
 		}
 		if ( p == ent->end() ) {
@@ -1977,7 +1977,7 @@ void TrWindow::recentFileActivated( int id )
 
 void TrWindow::addRecentlyOpenedFile( const TQString &fn, TQStringList &lst )
 {
-    if ( lst.tqfind( fn ) != lst.end() )
+    if ( lst.find( fn ) != lst.end() )
 	return;
     if ( lst.count() >= 10 )
 	lst.remove( lst.begin() );
diff --git a/tqtinterface/qt4/tools/linguist/linguist/trwindow.h b/tqtinterface/qt4/tools/linguist/linguist/trwindow.h
index 3e69534..142fde2 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/trwindow.h
+++ b/tqtinterface/qt4/tools/linguist/linguist/trwindow.h
@@ -96,9 +96,9 @@ private Q_SLOTS:
     void saveAs();
     void release();
     void print();
-    void tqfind();
-    void tqfindAgain();
-    void tqreplace();
+    void find();
+    void findAgain();
+    void replace();
     void newPhraseBook();
     void openPhraseBook();
     void closePhraseBook( int id );
@@ -119,7 +119,7 @@ private Q_SLOTS:
     void toggleFinished( TQListViewItem *item, const TQPoint& p, int column );
     void prevUnfinished();
     void nextUnfinished();
-    void tqfindNext( const TQString& text, int where, bool matchCase );
+    void findNext( const TQString& text, int where, bool matchCase );
     void revalidate();
     void toggleGuessing();
     void focusSourceList();
@@ -179,9 +179,9 @@ private:
 
     FindDialog *f;
     FindDialog *h;
-    TQString tqfindText;
-    int tqfindWhere;
-    bool tqfindMatchCase;
+    TQString findText;
+    int findWhere;
+    bool findMatchCase;
     int foundItem;
     TQListViewItem *foundScope;
     int foundWhere;
@@ -207,9 +207,9 @@ private:
     Action *copyAct;
     Action *pasteAct;
     Action *selectAllAct;
-    Action *tqfindAct;
-    Action *tqfindAgainAct;
-    Action *tqreplaceAct;
+    Action *findAct;
+    Action *findAgainAct;
+    Action *replaceAct;
     Action *newPhraseBookAct;
     Action *openPhraseBookAct;
     Action *acceleratorsAct;
diff --git a/tqtinterface/qt4/tools/linguist/lrelease/main.cpp b/tqtinterface/qt4/tools/linguist/lrelease/main.cpp
index a23f2ec..1f68326 100644
--- a/tqtinterface/qt4/tools/linguist/lrelease/main.cpp
+++ b/tqtinterface/qt4/tools/linguist/lrelease/main.cpp
@@ -65,7 +65,7 @@ static bool loadTsFile( MetaTranslator& tor, const TQString& tsFileName,
 			bool /* verbose */ )
 {
     TQString qmFileName = tsFileName;
-    qmFileName.tqreplace( TQRegExp("\\.ts$"), "" );
+    qmFileName.replace( TQRegExp("\\.ts$"), "" );
     qmFileName += ".qm";
 
     bool ok = tor.load( tsFileName );
@@ -96,7 +96,7 @@ static void releaseTsFile( const TQString& tsFileName, bool verbose,
     MetaTranslator tor;
     if ( loadTsFile(tor, tsFileName, verbose) ) {
 	TQString qmFileName = tsFileName;
-	qmFileName.tqreplace( TQRegExp("\\.ts$"), "" );
+	qmFileName.replace( TQRegExp("\\.ts$"), "" );
 	qmFileName += ".qm";
 	releaseMetaTranslator( tor, qmFileName, verbose, stripped );
     }
@@ -163,7 +163,7 @@ int main( int argc, char **argv )
 	TQString fullText = t.read();
 	f.close();
 
-	if ( fullText.tqfind(TQString("<!DOCTYPE TS>")) >= 0 ) {
+	if ( fullText.find(TQString("<!DOCTYPE TS>")) >= 0 ) {
 	    if ( outputFile.isEmpty() ) {
 		releaseTsFile( argv[i], verbose, stripped );
 	    } else {
diff --git a/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp b/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp
index 3d3f185..de638f7 100644
--- a/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp
+++ b/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp
@@ -185,7 +185,7 @@ static int getToken()
 		break;
 	    case 'f':
 		/*
-		  TQTranslator::tqfindMessage() has the same parameters as
+		  TQTranslator::findMessage() has the same parameters as
 		  TQApplication::translate().
 		*/
 		if ( strcmp(yyIdent + 1, "indMessage") == 0 )
@@ -228,7 +228,7 @@ static int getToken()
 			      delta;
 			  }
 
-		  The code tqcontains, indeed, two opening braces for
+		  The code contains, indeed, two opening braces for
 		  one closing brace; yet there's no reason to panic.
 
 		  The solution is to remember yyBraceDepth as it was
@@ -424,8 +424,8 @@ static int getToken()
 
 /*
   The second part of this source file is the parser. It accomplishes
-  a very easy task: It tqfinds all strings inside a tr() or translate()
-  call, and possibly tqfinds out the context of the call. It supports
+  a very easy task: It finds all strings inside a tr() or translate()
+  call, and possibly finds out the context of the call. It supports
   three cases: (1) the context is specified, as in
   FunnyDialog::tr("Hello") or translate("FunnyDialog", "Hello");
   (2) the call appears within an inlined function; (3) the call
@@ -545,12 +545,12 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 		    }
 		    prefix = (const char *) 0;
 
-		    if ( qualifiedContexts.tqcontains(context) )
+		    if ( qualifiedContexts.contains(context) )
 			context = qualifiedContexts[context];
 		    tor->insert( MetaTranslatorMessage(context, text, com,
 						       TQString(), utf8) );
 
-		    if ( lacks_TQ_OBJECT.tqcontains(context) ) {
+		    if ( lacks_TQ_OBJECT.contains(context) ) {
 			qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro",
 				  (const char *) yyFileName, yyLineNo,
 				  (const char *) context );
@@ -597,7 +597,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 	    com = com.simplifyWhiteSpace();
 	    if ( com.left(sizeof(MagicComment) - 1) == MagicComment ) {
 		com.remove( 0, sizeof(MagicComment) - 1 );
-		int k = com.tqfind( ' ' );
+		int k = com.find( ' ' );
 		if ( k == -1 ) {
 		    context = com;
 		} else {
@@ -612,7 +612,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 		  namespace". See the manual for details.
 		*/
 		k = 0;
-		while ( (k = context.tqfind("::", k)) != -1 ) {
+		while ( (k = context.find("::", k)) != -1 ) {
 		    qualifiedContexts.insert( context.mid(k + 2), context );
 		    k++;
 		}
@@ -638,7 +638,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
 		namespaces.remove( namespaces.fromLast() );
 	    if ( yyBraceDepth == (int) namespaces.count() ) {
 		if ( missing_TQ_OBJECT ) {
-		    if ( needs_TQ_OBJECT.tqcontains(functionContext) ) {
+		    if ( needs_TQ_OBJECT.contains(functionContext) ) {
 			qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro",
 				  (const char *) yyFileName, yyLineNo,
 				  (const char *) functionContext );
@@ -748,7 +748,7 @@ bool UiHandler::endElement( const TQString& /* namespaceURI */,
 			    const TQString& /* localName */,
 			    const TQString& qName )
 {
-    accum.tqreplace( TQRegExp(TQString("\r\n")), "\n" );
+    accum.replace( TQRegExp(TQString("\r\n")), "\n" );
 
     if ( qName == TQString("class") ) {
 	if ( context.isEmpty() )
diff --git a/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp b/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp
index bc409db..f734763 100644
--- a/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp
+++ b/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp
@@ -66,7 +66,7 @@ void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose )
 
 	// skip context comment
 	if ( !TQCString((*it).sourceText()).isEmpty() ) {
-	    if ( !virginTor->tqcontains((*it).context(), (*it).sourceText(),
+	    if ( !virginTor->contains((*it).context(), (*it).sourceText(),
 				      (*it).comment()) ) {
 		newType = MetaTranslatorMessage::Obsolete;
 		if ( m.type() != MetaTranslatorMessage::Obsolete )
@@ -102,7 +102,7 @@ void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose )
     all = virginTor->messages();
 
     for ( it = all.begin(); it != all.end(); ++it ) {
-	if ( !tor->tqcontains((*it).context(), (*it).sourceText(),
+	if ( !tor->contains((*it).context(), (*it).sourceText(),
 			    (*it).comment()) ) {
 	    tor->insert( *it );
 	    if ( !TQCString((*it).sourceText()).isEmpty() )
diff --git a/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp b/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp
index ba54dae..cc16014 100644
--- a/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp
+++ b/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp
@@ -64,7 +64,7 @@ static int numberLength( const char *s )
 }
 
 /*
-  Returns a version of 'key' where all numbers have been tqreplaced by zeroes.  If
+  Returns a version of 'key' where all numbers have been replaced by zeroes.  If
   there were none, returns "".
 */
 static TQCString zeroKey( const char *key )
@@ -97,7 +97,7 @@ static TQString translationAttempt( const TQString& oldTranslation,
 				   const char *oldSource,
 				   const char *newSource )
 {
-    int p = zeroKey( oldSource ).tqcontains( '0' );
+    int p = zeroKey( oldSource ).contains( '0' );
     int oldSourceLen = tqstrlen( oldSource );
     TQString attempt;
     TQStringList oldNumbers;
@@ -134,7 +134,7 @@ static TQString translationAttempt( const TQString& oldTranslation,
     /*
       We now go over the old translation, "XeT 3.0", one letter at a
       time, looking for numbers found in oldNumbers. Whenever such a
-      number is met, it is tqreplaced with its newNumber equivalent. In
+      number is met, it is replaced with its newNumber equivalent. In
       our example, the "3.0" of "XeT 3.0" becomes "3.1".
     */
     for ( i = 0; i < (int) oldTranslation.length(); i++ ) {
@@ -147,7 +147,7 @@ static TQString translationAttempt( const TQString& oldTranslation,
 	}
 
 	/*
-	  Let's tqfind out if the last character ended a match. We make
+	  Let's find out if the last character ended a match. We make
 	  two passes over the data. In the first pass, we try to
 	  match only numbers that weren't matched yet; if that fails,
 	  the second pass does the trick. This is useful in some
@@ -232,7 +232,7 @@ void applyNumberHeuristic( MetaTranslator *tor, bool verbose )
     }
 
     for ( u = untranslated.begin(); u != untranslated.end(); ++u ) {
-	t = translated.tqfind( zeroKey((*u).sourceText()) );
+	t = translated.find( zeroKey((*u).sourceText()) );
 	if ( t != translated.end() && !t.key().isEmpty() &&
 	     qstrcmp((*t).sourceText(), (*u).sourceText()) != 0 ) {
 	    MetaTranslatorMessage m( *u );
diff --git a/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp b/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp
index 456ad7d..4679917 100644
--- a/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp
+++ b/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp
@@ -64,7 +64,7 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose )
 		untranslated.append( *it );
 	} else {
 	    TQCString key = (*it).sourceText();
-	    t = translated.tqfind( key );
+	    t = translated.find( key );
 	    if ( t != translated.end() ) {
 		/*
 		  The same source text is translated at least two
@@ -74,7 +74,7 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose )
 		    translated.remove( key );
 		    avoid.insert( key, *it );
 		}
-	    } else if ( !avoid.tqcontains(key) &&
+	    } else if ( !avoid.contains(key) &&
 			!(*it).translation().isEmpty() ) {
 		translated.insert( key, *it );
 	    }
@@ -83,7 +83,7 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose )
 
     for ( u = untranslated.begin(); u != untranslated.end(); ++u ) {
 	TQCString key = (*u).sourceText();
-	t = translated.tqfind( key );
+	t = translated.find( key );
 	if ( t != translated.end() ) {
 	    MetaTranslatorMessage m( *u );
 	    m.setTranslation( (*t).translation() );
diff --git a/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph b/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph
index 7a71500..906f547 100644
--- a/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph
+++ b/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph
@@ -260,7 +260,7 @@
 </phrase>
 <phrase>
     <source>Explore</source>
-    <target>Stitqfinder</target>
+    <target>Stifinder</target>
 </phrase>
 <phrase>
     <source>extended selection</source>
@@ -993,7 +993,7 @@
 </phrase>
 <phrase>
     <source>Windows Explorer</source>
-    <target>Windows Stitqfinder</target>
+    <target>Windows Stifinder</target>
 </phrase>
 <phrase>
     <source>wizard</source>
diff --git a/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp b/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp
index 71e361d..92b56d6 100644
--- a/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp
+++ b/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp
@@ -72,7 +72,7 @@ int main( int argc, char **argv )
 	TQTranslator tor( 0 );
 	if ( tor.load(argv[i], ".") ) {
 	    TQString g = argv[i];
-	    g.tqreplace( TQRegExp(TQString("\\.qm$")), TQString() );
+	    g.replace( TQRegExp(TQString("\\.qm$")), TQString() );
 	    g += TQString( ".ts" );
 
 	    if ( verbose )
diff --git a/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1 b/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1
index 6cdf129..e1eb472 100644
--- a/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1
+++ b/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1
@@ -28,7 +28,7 @@ and
 .B qm2ts
 is provided to ease porting from the old internationalization
 tools
-.B (tqfindtr,
+.B (findtr,
 .B mergetr
 and
 .B msg2qm)
diff --git a/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp b/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp
index e6cde6c..fee2a00 100644
--- a/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp
+++ b/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp
@@ -180,7 +180,7 @@ bool TsHandler::endElement( const TQString& /* namespaceURI */,
 bool TsHandler::characters( const TQString& ch )
 {
     TQString t = ch;
-    t.tqreplace( "\r", "" );
+    t.replace( "\r", "" );
     accum += t;
     return TRUE;
 }
@@ -482,8 +482,8 @@ bool MetaTranslator::release( const TQString& filename, bool verbose,
 		  sourceText, comment0).
 		*/
 		if ( comment.isEmpty()
-		     || tqcontains(context, sourceText, "")
-		     || !tor.tqfindMessage(context, sourceText, "").translation()
+		     || contains(context, sourceText, "")
+		     || !tor.findMessage(context, sourceText, "").translation()
 			    .isNull() ) {
 		    tor.insert( m.key() );
 		} else {
@@ -503,20 +503,20 @@ bool MetaTranslator::release( const TQString& filename, bool verbose,
     return saved;
 }
 
-bool MetaTranslator::tqcontains( const char *context, const char *sourceText,
+bool MetaTranslator::contains( const char *context, const char *sourceText,
 			       const char *comment ) const
 {
-    return mm.tqfind( MetaTranslatorMessage(context, sourceText, comment) ) !=
+    return mm.find( MetaTranslatorMessage(context, sourceText, comment) ) !=
 	   mm.end();
 }
 
 void MetaTranslator::insert( const MetaTranslatorMessage& m )
 {
     int pos = (int)mm.count();
-    TMM::Iterator n = mm.tqfind( m );
+    TMM::Iterator n = mm.find( m );
     if ( n != mm.end() )
 	pos = *n;
-    mm.tqreplace( m, pos );
+    mm.replace( m, pos );
 }
 
 void MetaTranslator::stripObsoleteMessages()
diff --git a/tqtinterface/qt4/tools/linguist/shared/metatranslator.h b/tqtinterface/qt4/tools/linguist/shared/metatranslator.h
index 1673d57..52b2504 100644
--- a/tqtinterface/qt4/tools/linguist/shared/metatranslator.h
+++ b/tqtinterface/qt4/tools/linguist/shared/metatranslator.h
@@ -89,7 +89,7 @@ public:
     bool release( const TQString& filename, bool verbose = FALSE,
 		  TQTranslator::SaveMode mode = TQTranslator::Stripped ) const;
 
-    bool tqcontains( const char *context, const char *sourceText,
+    bool contains( const char *context, const char *sourceText,
 		   const char *comment ) const;
     void insert( const MetaTranslatorMessage& m );
 
diff --git a/tqtinterface/qt4/tools/linguist/shared/proparser.cpp b/tqtinterface/qt4/tools/linguist/shared/proparser.cpp
index 12af0ec..ab32500 100644
--- a/tqtinterface/qt4/tools/linguist/shared/proparser.cpp
+++ b/tqtinterface/qt4/tools/linguist/shared/proparser.cpp
@@ -77,7 +77,7 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text )
 	    still need to do it after we include to make sure the
 	    included file does not have comments
 	*/
-	t.tqreplace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") );
+	t.replace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") );
 
 	/*
 	    Process include() commands.
@@ -89,39 +89,39 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text )
 	while ( (i = callToInclude.search(t, i)) != -1 ) {
 	    bool doneWithVar = false;
 	    TQString fileName = callToInclude.cap(1);
-	    TQString after = fileName.tqreplace("$$PWD", TQDir::currentDirPath());
-	    if (!tagMap.isEmpty() && after.tqcontains("$$")) {
+	    TQString after = fileName.replace("$$PWD", TQDir::currentDirPath());
+	    if (!tagMap.isEmpty() && after.contains("$$")) {
 		TQRegExp var( "\\$\\$[({]?([a-zA-Z0-9_]+)[)}]?" );
 		int ii = 0;
-		while ((ii = after.tqfind(var, ii)) != -1) {
-		    if (tagMap.tqcontains(var.cap(1))) {
-			after.tqreplace(ii, var.cap(0).length(), tagMap[var.cap(1)]);
-		    } else { // Couldn't tqfind it
+		while ((ii = after.find(var, ii)) != -1) {
+		    if (tagMap.contains(var.cap(1))) {
+			after.replace(ii, var.cap(0).length(), tagMap[var.cap(1)]);
+		    } else { // Couldn't find it
 			doneWithVar = true;
 			break;
 		    }
 		}
 		
 	    }
-	    if (doneWithVar || !after.tqcontains("$$")) {
+	    if (doneWithVar || !after.contains("$$")) {
 		after = loadFile(after);
 		TQFileInfo fi(callToInclude.cap(1));
-		after.tqreplace("$$PWD", fi.dirPath());
-		t.tqreplace( i, callToInclude.matchedLength(), after );
+		after.replace("$$PWD", fi.dirPath());
+		t.replace( i, callToInclude.matchedLength(), after );
 	    }
 	    i += after.length();
 	}
 
 	/*
 	    Strip comments, merge lines ending with backslash, add
-	    spaces around '=' and '+=', tqreplace '\n' with ';', and
+	    spaces around '=' and '+=', replace '\n' with ';', and
 	    simplify white spaces.
 	*/
-	t.tqreplace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") );
-	t.tqreplace( TQRegExp(TQString("\\\\[^\n\\S]*\n")), TQString(" ") );
-	t.tqreplace( "=", TQString(" = ") );
-	t.tqreplace( "+ =", TQString(" += ") );
-	t.tqreplace( "\n", TQString(";") );
+	t.replace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") );
+	t.replace( TQRegExp(TQString("\\\\[^\n\\S]*\n")), TQString(" ") );
+	t.replace( "=", TQString(" = ") );
+	t.replace( "+ =", TQString(" += ") );
+	t.replace( "\n", TQString(";") );
 	t = t.simplifyWhiteSpace();
 	
 	/*
@@ -135,7 +135,7 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text )
 	    if ( toks.count() >= 3 && 
 		(toks[1] == TQString("=") || toks[1] == TQString("+=")) ) {
 		TQString tag = toks.first();
-		int k = tag.tqfindRev( TQChar(':') ); // as in 'unix:'
+		int k = tag.findRev( TQChar(':') ); // as in 'unix:'
 		if ( k != -1 )
 		    tag = tag.mid( k + 1 );
 		toks.remove( toks.begin() );
@@ -143,9 +143,9 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text )
 		TQString action = toks.first();
 		toks.remove( toks.begin() );
 		
-		if ( tagMap.tqcontains(tag) ) {
+		if ( tagMap.contains(tag) ) {
 		    if ( action == TQString("=") )
-			tagMap.tqreplace( tag, toks.join(TQChar(' ')) );
+			tagMap.replace( tag, toks.join(TQChar(' ')) );
 		    else
 			tagMap[tag] += TQChar( ' ' ) + toks.join( TQChar(' ') );
 		} else {
@@ -171,11 +171,11 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text )
 		    // skip system(); it will be handled in the next pass
 		    ++i;
 		} else {
-		    if ( tagMap.tqcontains(invocation) )
+		    if ( tagMap.contains(invocation) )
 			after = tagMap[invocation];
 		    else if (invocation.lower() == "pwd")
 			after = TQDir::currentDirPath();
-		    (*it).tqreplace( i, len, after );
+		    (*it).replace( i, len, after );
 		    i += after.length();
 		}
 	    }
@@ -207,7 +207,7 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text )
 		    buff[read_in] = '\0';
 		    after += buff;
 		}
-		(*it).tqreplace( i, callToSystem.matchedLength(), after );
+		(*it).replace( i, callToSystem.matchedLength(), after );
 		i += after.length();
 	    }
 	}