From 36753ac659fe85fd02a8dffa84143812e011cd71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 7 Nov 2013 22:42:05 -0600 Subject: [PATCH] Revert "Update minor TQt3 tool names to match current TQt3 sources in GIT" This reverts commit 40e50e6f20276afb557992a51d47618b014e388d. --- bin/tqt20fix | 14 +++++++------- bin/tqtfindtr | 2 +- doc/html/i18n.html | 2 +- doc/html/linguist-manual-2.html | 2 +- doc/html/porting2.html | 2 +- doc/i18n.doc | 4 ++-- doc/man/README | 8 ++++---- doc/man/man1/tqt20fix.1 | 8 ++++---- doc/man/man1/tqtcreatecw.1 | 10 +++++----- doc/man/man1/tqtfindtr.1 | 8 ++++---- doc/man/man1/tqtmergetr.1 | 16 ++++++++-------- doc/porting2.doc | 2 +- src/kernel/ntq1xcompatibility.h | 2 +- tools/designer/designer.pro | 4 ++-- tools/designer/designer/customwidgeteditor.ui | 2 +- tools/designer/designer/designer_de.ts | 2 +- tools/designer/designer/designer_fr.ts | 2 +- tools/designer/tools/tqtconv2ui/main.cpp | 6 +++--- tools/designer/tools/tqtcreatecw/main.cpp | 4 ++-- tools/designer/tools/tqtcreatecw/tqtcreatecw.pro | 2 +- tools/linguist/book/linguist-manager.leaf | 2 +- tools/linguist/linguist.pro | 2 +- tools/linguist/tqm2ts/main.cpp | 12 ++++++------ tools/linguist/tqm2ts/tqm2ts.1 | 14 +++++++------- tools/linguist/tqm2ts/tqm2ts.pro | 2 +- tools/msg2tqm/msg2tqm.cpp | 2 +- tools/tools.pro | 2 +- tools/tqtmergetr/tqtmergetr.cpp | 2 +- tools/tqtmergetr/tqtmergetr.pro | 4 ++-- 29 files changed, 72 insertions(+), 72 deletions(-) diff --git a/bin/tqt20fix b/bin/tqt20fix index 371faef7..a303717b 100755 --- a/bin/tqt20fix +++ b/bin/tqt20fix @@ -1,14 +1,14 @@ #!/usr/bin/perl -w # # in sh/bash/zsh: -# make 2>&1 | .../qt/bin/ttqt20fix +# make 2>&1 | .../qt/bin/tqt20fix # in csh/tcsh -# make |& .../qt/bin/ttqt20fix +# make |& .../qt/bin/tqt20fix # -# repeat as long as ttqt20fix says to. if your make supports the -k +# repeat as long as tqt20fix says to. if your make supports the -k # flag, that speeds up the process a bit. # -# ttqt20fix tends to fix a bit over half of the remaining problems in +# tqt20fix tends to fix a bit over half of the remaining problems in # each run. # # if you don't use gcc, you will need to change parseline. @@ -222,7 +222,7 @@ while( ) { if ( defined( $lastfile ) ) { open( O, "> $lastfile" ) || die "cannot write to $lastfile, stopped"; - print "ttqt20fix: writing $lastfile (changes: $changes)\n"; + print "tqt20fix: writing $lastfile (changes: $changes)\n"; print O @currentfile; close O; } @@ -248,12 +248,12 @@ while( ) { if ( defined( $changes) && $changes > 0 && defined( $lastfile ) ) { open( O, "> $lastfile" ) || die "cannot write to $lastfile, stopped"; - print "ttqt20fix: writing $lastfile (changes: $changes)\n"; + print "tqt20fix: writing $lastfile (changes: $changes)\n"; print O @currentfile; close O; } if ( defined( $totalchanges) && $totalchanges > 0 ) { - print "ttqt20fix: total changes: $totalchanges\nttqt20fix: rerun recommended\n"; + print "tqt20fix: total changes: $totalchanges\ntqt20fix: rerun recommended\n"; } diff --git a/bin/tqtfindtr b/bin/tqtfindtr index 52134cea..c7b82d14 100755 --- a/bin/tqtfindtr +++ b/bin/tqtfindtr @@ -37,7 +37,7 @@ msgstr "" $scope = ""; if ( $#ARGV < 0 ) { - print STDERR "Usage: tqttqtfindtr sourcefile ... >project.po\n"; + print STDERR "Usage: tqtfindtr sourcefile ... >project.po\n"; exit 1; } diff --git a/doc/html/i18n.html b/doc/html/i18n.html index a9b38e16..55ca647e 100644 --- a/doc/html/i18n.html +++ b/doc/html/i18n.html @@ -347,7 +347,7 @@ file for lupdate; your qmake project file will work fine once you add the TRANSLATIONS entry.

In your application, you must TQTranslator::load() the translation files appropriate for the user's language, and install them using TQApplication::installTranslator(). -

If you have been using the old TQt tools (tqttqtfindtr, msg2tqm and tqttqtmergetr), you can use ttqm2ts to convert your old .qm files. +

If you have been using the old TQt tools (tqtfindtr, msg2tqm and tqtmergetr), you can use tqm2ts to convert your old .qm files.

linguist, lupdate and lrelease are installed in the bin subdirectory of the base directory TQt is installed into. Click Help|Manual in TQt Linguist to access the user's manual; it contains a tutorial diff --git a/doc/html/linguist-manual-2.html b/doc/html/linguist-manual-2.html index 9f37ce17..19db9a40 100644 --- a/doc/html/linguist-manual-2.html +++ b/doc/html/linguist-manual-2.html @@ -32,7 +32,7 @@ body { background: #ffffff; color: black; }

[Prev: Introduction] [Home] [Next: Translators]

Release Manager

Two tools are provided for the release manager, lupdate and lrelease. These tools depend on qmake project files. You don't have to use qmake, though.

-

A third tool, ttqm2ts, can be used for converting TQt 2.x message files to .ts files.

+

A third tool, tqm2ts, can be used for converting TQt 2.x message files to .ts files.

TQt Project Files

lupdate and lrelease depend on information in the application's .pro TQt project file. There must be an entry in the TRANSLATIONS section of the project file for each language that is additional to the native language. A typical entry looks like this:

    TRANSLATIONS    = tt2_fr.ts \
diff --git a/doc/html/porting2.html b/doc/html/porting2.html
index 7c4d4b16..f34efd8d 100644
--- a/doc/html/porting2.html
+++ b/doc/html/porting2.html
@@ -134,7 +134,7 @@ etc. are totally unaffected, but code that is
 not in functions of classes inherited from TQt,
 you must qualify these identifiers like this: TQt::red,
 TQt::LeftButton, TQt::AlignRight, etc.
-
 
The qt/bin/ttqt20fix script helps to fix the code that
+
 
The qt/bin/tqt20fix script helps to fix the code that
 needs adaption, though most code does not need changing.
 
 Compiling with -DQT1COMPATIBILITY will help you get going with TQt 2.x
 - it allows all the old "dirty namespace" identifiers from TQt 1.x to
diff --git a/doc/i18n.doc b/doc/i18n.doc
index a8c542ee..837b2bbf 100644
--- a/doc/i18n.doc
+++ b/doc/i18n.doc
@@ -372,8 +372,8 @@ In your application, you must \l QTranslator::load() the translation
 files appropriate for the user's language, and install them using \l
 QApplication::installTranslator().
 
-If you have been using the old Qt tools (\c tqttqtfindtr, \c msg2tqm and \c
-tqttqtmergetr), you can use \e ttqm2ts to convert your old \c .qm files.
+If you have been using the old Qt tools (\c tqtfindtr, \c msg2tqm and \c
+tqtmergetr), you can use \e tqm2ts to convert your old \c .qm files.
 
 \e linguist, \e lupdate and \e lrelease are installed in the \c bin
 subdirectory of the base directory Qt is installed into. Click Help|Manual
diff --git a/doc/man/README b/doc/man/README
index 3b0b254e..e9e38cf1 100644
--- a/doc/man/README
+++ b/doc/man/README
@@ -36,14 +36,14 @@ Debian distribution
     (http://ftp.de.debian.org/debian/pool/main/q/qt-x11-free/)
         qt-x11-free_3.3.8b-11.*
         qt-x11-free_3.3.8b.orig.tar.gz
-  man1/tqttqtcreatecw.1
+  man1/tqtcreatecw.1
   man1/designer.1
-  man1/tqttqtfindtr.1
+  man1/tqtfindtr.1
   man1/linguist.1
   man1/maketqpf.1
-  man1/tqttqtmergetr.1
+  man1/tqtmergetr.1
   man1/msg2tqm.1
   man1/qembed.1
-  man1/ttqt20fix.1
+  man1/tqt20fix.1
   man1/qtconfig.1
   man1/tqvfb.1
diff --git a/doc/man/man1/tqt20fix.1 b/doc/man/man1/tqt20fix.1
index 54e67f4e..56a79a18 100644
--- a/doc/man/man1/tqt20fix.1
+++ b/doc/man/man1/tqt20fix.1
@@ -1,10 +1,10 @@
-.TH "ttqt20fix" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.TH "tqt20fix" "1" "3.0.3" "Troll Tech AS, Norway." ""
 .SH "NAME"
 .LP 
-ttqt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2
+tqt20fix \- Helps clean namespace when porting an app from Qt1 to Qt2
 .SH "SYNTAX"
 .LP 
-ttqt20fix myapp.cpp
+tqt20fix myapp.cpp
 
 .SH "DESCRIPTION"
 .LP 
@@ -19,7 +19,7 @@ functions of classes inherited from Qt, you must qualify
 these identifiers like this: Qt::red, Qt::LeftButton,
 Qt::AlignRight, etc. 
 
-The qt/bin/ttqt20fix script helps to fix the code that
+The qt/bin/tqt20fix script helps to fix the code that
 needs adaption, though most code does not need changing.
 
 Compiling with \-DQT1COMPATIBILITY will help you get going
diff --git a/doc/man/man1/tqtcreatecw.1 b/doc/man/man1/tqtcreatecw.1
index d261f662..4567e5f1 100644
--- a/doc/man/man1/tqtcreatecw.1
+++ b/doc/man/man1/tqtcreatecw.1
@@ -1,10 +1,10 @@
-.TH "tqttqtcreatecw" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.TH "tqtcreatecw" "1" "3.0.3" "Troll Tech AS, Norway." ""
 .SH "NAME"
 .LP 
-tqttqtcreatecw \- custom widget description creater for Qt Designer
+tqtcreatecw \- custom widget description creater for Qt Designer
 .SH "SYNTAX"
 .LP 
-tqttqtcreatecw <\fIfilename.cw\fP>
+tqtcreatecw <\fIfilename.cw\fP>
 .SH "DESCRIPTION"
 .LP 
 This small application makes it much easier to create
@@ -44,8 +44,8 @@ would write here
 After that compile the program, link it with your custom
 widget (library or object file) and run it like this:
 
- (unix): ./tqttqtcreatecw mywidgets.cw
- (win32): tqttqtcreatecw mywidgets.cw
+ (unix): ./tqtcreatecw mywidgets.cw
+ (win32): tqtcreatecw mywidgets.cw
 
 After that you can import this description file into the
 Qt Designer using the Custom\-Widget Dialog (See
diff --git a/doc/man/man1/tqtfindtr.1 b/doc/man/man1/tqtfindtr.1
index 59cf7366..163af792 100644
--- a/doc/man/man1/tqtfindtr.1
+++ b/doc/man/man1/tqtfindtr.1
@@ -1,10 +1,10 @@
-.TH "tqttqtfindtr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.TH "tqtfindtr" "1" "3.0.3" "Troll Tech AS, Norway." ""
 .SH "NAME"
 .LP 
-tqttqtfindtr \- Extracts information about text to be translated
+tqtfindtr \- Extracts information about text to be translated
 .SH "SYNTAX"
 .LP 
-tqttqtfindtr *.cpp *.h >myapp.po
+tqtfindtr *.cpp *.h >myapp.po
 .SH "DESCRIPTION"
 .LP 
 
@@ -17,7 +17,7 @@ translated versions of the file would then be
 myapp_de.po, myapp_fr.po, and myapp_ja.po for
 translations in German, French and Japanese respectively.
 
-  tqttqtfindtr *.cpp *.h >myapp.po
+  tqtfindtr *.cpp *.h >myapp.po
   copy myapp.po myapp_de.po
   edit myapp_de.po
 .SH "AUTHORS"
diff --git a/doc/man/man1/tqtmergetr.1 b/doc/man/man1/tqtmergetr.1
index c28dba98..a2c574f8 100644
--- a/doc/man/man1/tqtmergetr.1
+++ b/doc/man/man1/tqtmergetr.1
@@ -1,21 +1,21 @@
-.TH "tqttqtmergetr" "1" "3.0.3" "Troll Tech AS, Norway." ""
+.TH "tqtmergetr" "1" "3.0.3" "Troll Tech AS, Norway." ""
 .SH "NAME"
 .LP 
-tqttqtmergetr \- Merge changes in translations
+tqtmergetr \- Merge changes in translations
 .SH "SYNTAX"
 .LP 
-tqttqtmergetr myapp_de.po myapp.po
+tqtmergetr myapp_de.po myapp.po
 
 .SH "DESCRIPTION"
 .LP 
 When the texts in your program change as it is developed,
-a the base .po file can be regenerated using tqttqtfindtr,
-then tqttqtmergetr can be used to merge the changes into the
+a the base .po file can be regenerated using tqtfindtr,
+then tqtmergetr can be used to merge the changes into the
 other .po files: 
 
-                tqttqtmergetr myapp_de.po myapp.po
-                tqttqtmergetr myapp_fr.po myapp.po
-                tqttqtmergetr myapp_ja.po myapp.po
+                tqtmergetr myapp_de.po myapp.po
+                tqtmergetr myapp_fr.po myapp.po
+                tqtmergetr myapp_ja.po myapp.po
 
 
 The translation team then edits the new .po files to
diff --git a/doc/porting2.doc b/doc/porting2.doc
index 1cfbd8e9..dddd972d 100644
--- a/doc/porting2.doc
+++ b/doc/porting2.doc
@@ -157,7 +157,7 @@ etc. are totally unaffected, but code that is
 you must qualify these identifiers like this: Qt::red,
 Qt::LeftButton, Qt::AlignRight, etc.
 
-
The qt/bin/ttqt20fix script helps to fix the code that
+
The qt/bin/tqt20fix script helps to fix the code that
 needs adaption, though most code does not need changing.
 
 Compiling with -DQT1COMPATIBILITY will help you get going with Qt 2.x
diff --git a/src/kernel/ntq1xcompatibility.h b/src/kernel/ntq1xcompatibility.h
index eaf1f224..16aeaaf1 100644
--- a/src/kernel/ntq1xcompatibility.h
+++ b/src/kernel/ntq1xcompatibility.h
@@ -43,7 +43,7 @@
 #define Q1XCOMPATIBILITY_H
 
 #error "Compatibility with TQt 1.x is no longer guaranteed. Please"
-#error "update your code (for example using ttqt20fix script). We"
+#error "update your code (for example using tqt20fix script). We"
 #error "apologize for any inconvenience."
 
 #endif // Q1XCOMPATIBILITY_H
diff --git a/tools/designer/designer.pro b/tools/designer/designer.pro
index a3007035..bbe68ada 100644
--- a/tools/designer/designer.pro
+++ b/tools/designer/designer.pro
@@ -6,8 +6,8 @@ SUBDIRS	=  uic \
 	   uilib \
 	   designer \
 	   app \
-	   tools/tqttqtcreatecw \
-	   tools/tqtqtconv2ui
+	   tools/tqtcreatecw \
+	   tools/tqtconv2ui
 
 dll:SUBDIRS *=  editor plugins
 shared:SUBDIRS *=  editor plugins
diff --git a/tools/designer/designer/customwidgeteditor.ui b/tools/designer/designer/customwidgeteditor.ui
index 82744a88..a8623cff 100644
--- a/tools/designer/designer/customwidgeteditor.ui
+++ b/tools/designer/designer/customwidgeteditor.ui
@@ -186,7 +186,7 @@
             
             
                 <b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the TQt Designer.</p>
-<p>Since it is a lot of work to type in all the information for custom widgets, you should consider using the tqttqtcreatecw tool which is in $QTDIR/tools/designer/tools/tqttqtcreatecw. Using tqttqtcreatecw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the tqttqtcreatecw directory</p>
+<p>Since it is a lot of work to type in all the information for custom widgets, you should consider using the tqtcreatecw tool which is in $QTDIR/tools/designer/tools/tqtcreatecw. Using tqtcreatecw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the tqtcreatecw directory</p>
             
         
         
diff --git a/tools/designer/designer/designer_de.ts b/tools/designer/designer/designer_de.ts
index e710619c..f2c55cff 100644
--- a/tools/designer/designer/designer_de.ts
+++ b/tools/designer/designer/designer_de.ts
@@ -424,7 +424,7 @@ so it is not possible to rename it to this name.
     
     
         <b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p>
-<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool tqttqtcreatecw which you can find in $QTDIR/tools/designer/tools/tqttqtcreatecw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p>
+<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool tqtcreatecw which you can find in $QTDIR/tools/designer/tools/tqtcreatecw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p>
         
     
     
diff --git a/tools/designer/designer/designer_fr.ts b/tools/designer/designer/designer_fr.ts
index e710619c..f2c55cff 100644
--- a/tools/designer/designer/designer_fr.ts
+++ b/tools/designer/designer/designer_fr.ts
@@ -424,7 +424,7 @@ so it is not possible to rename it to this name.
     
     
         <b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p>
-<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool tqttqtcreatecw which you can find in $QTDIR/tools/designer/tools/tqttqtcreatecw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p>
+<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool tqtcreatecw which you can find in $QTDIR/tools/designer/tools/tqtcreatecw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p>
         
     
     
diff --git a/tools/designer/tools/tqtconv2ui/main.cpp b/tools/designer/tools/tqtconv2ui/main.cpp
index 9a8ee901..208be173 100644
--- a/tools/designer/tools/tqtconv2ui/main.cpp
+++ b/tools/designer/tools/tqtconv2ui/main.cpp
@@ -137,11 +137,11 @@ TQString Conv2ui::absName( const TQString & filename )
 
 void printHelpMessage( TQStringList & formats )
 {
-    printf( "Usage: tqtqtconv2ui [options]  \n\n" );
+    printf( "Usage: tqtconv2ui [options]  \n\n" );
     printf( "Options:\n");
     printf( "\t-help\t\tDisplay this information\n" );
     printf( "\t-silent\t\tDon't write any messages\n");
-    printf( "\t-version\tDisplay version of tqtqtconv2ui\n");
+    printf( "\t-version\tDisplay version of tqtconv2ui\n");
     printf( "Supported file formats:\n" );
     for ( TQStringList::Iterator it = formats.begin(); it != formats.end(); ++it )
 	printf( "\t%s\n", (*it).latin1() );
@@ -201,7 +201,7 @@ int main( int argc, char ** argv )
     if ( !silent ) {
         printf( "TQt user interface file converter.\n" );
 	if ( unrecognized ) {
-	    printf( "tqtqtconv2ui: Unrecognized option\n" );
+	    printf( "tqtconv2ui: Unrecognized option\n" );
 	}
     }
     if ( version ) {
diff --git a/tools/designer/tools/tqtcreatecw/main.cpp b/tools/designer/tools/tqtcreatecw/main.cpp
index 57e869b4..fcfa4316 100644
--- a/tools/designer/tools/tqtcreatecw/main.cpp
+++ b/tools/designer/tools/tqtcreatecw/main.cpp
@@ -172,8 +172,8 @@ int main( int argc, char **argv )
     //
     // After that compile the program, link it with your custom widget
     // (library or object file) and run it like this:
-    // (unix): ./tqttqtcreatecw mywidgets.cw
-    // (win32): tqttqtcreatecw mywidgets.cw
+    // (unix): ./tqtcreatecw mywidgets.cw
+    // (win32): tqtcreatecw mywidgets.cw
     //
     // After that you can import this description file into the TQt
     // Designer using the Custom-Widget Dialog (See
diff --git a/tools/designer/tools/tqtcreatecw/tqtcreatecw.pro b/tools/designer/tools/tqtcreatecw/tqtcreatecw.pro
index e8b76edd..875a2e7b 100644
--- a/tools/designer/tools/tqtcreatecw/tqtcreatecw.pro
+++ b/tools/designer/tools/tqtcreatecw/tqtcreatecw.pro
@@ -2,7 +2,7 @@ TEMPLATE	= app
 CONFIG		+= qt warn_on release
 HEADERS		=
 SOURCES		= main.cpp
-TARGET		= tqttqtcreatecw
+TARGET		= tqtcreatecw
 
 target.path = $$bins.path
 INSTALLS += target
diff --git a/tools/linguist/book/linguist-manager.leaf b/tools/linguist/book/linguist-manager.leaf
index b0b23b1f..c35aa1af 100644
--- a/tools/linguist/book/linguist-manager.leaf
+++ b/tools/linguist/book/linguist-manager.leaf
@@ -6,7 +6,7 @@ Two tools are provided for the release manager, \l lupdate and \l
 lrelease. These tools depend on \e qmake project files. You don't
 have to use \e qmake, though.
 
-A third tool, \c ttqm2ts, can be used for converting Qt 2.x message
+A third tool, \c tqm2ts, can be used for converting Qt 2.x message
 files to \c .ts files.
 
 \section1 Qt Project Files
diff --git a/tools/linguist/linguist.pro b/tools/linguist/linguist.pro
index a72b2159..d34c3860 100644
--- a/tools/linguist/linguist.pro
+++ b/tools/linguist/linguist.pro
@@ -5,7 +5,7 @@ SUBDIRS		= linguist \
 		  tutorial/tt3 \
 		  lrelease \
 		  lupdate \
-		  ttqm2ts
+		  tqm2ts
 CONFIG += ordered
 
 REQUIRES=full-config nocrosscompiler
diff --git a/tools/linguist/tqm2ts/main.cpp b/tools/linguist/tqm2ts/main.cpp
index 3dcd6bc2..6e71a3cb 100644
--- a/tools/linguist/tqm2ts/main.cpp
+++ b/tools/linguist/tqm2ts/main.cpp
@@ -42,13 +42,13 @@ typedef TQValueList TML;
 static void printUsage()
 {
     fprintf( stderr, "Usage:\n"
-	     "    ttqm2ts [ options ] qm-files\n"
+	     "    tqm2ts [ options ] qm-files\n"
 	     "Options:\n"
 	     "    -help  Display this information and exit\n"
 	     "    -verbose\n"
 	     "           Explain what is being done\n"
 	     "    -version\n"
-	     "           Display the version of ttqm2ts and exit\n" );
+	     "           Display the version of tqm2ts and exit\n" );
 }
 
 int main( int argc, char **argv )
@@ -64,7 +64,7 @@ int main( int argc, char **argv )
 	    verbose = TRUE;
 	    continue;
 	} else if ( qstrcmp(argv[i], "-version") == 0 ) {
-	    fprintf( stderr, "ttqm2ts version %s\n", TQT_VERSION_STR );
+	    fprintf( stderr, "tqm2ts version %s\n", TQT_VERSION_STR );
 	    return 0;
 	}
 
@@ -99,7 +99,7 @@ int main( int argc, char **argv )
 
 	    if ( !metator.save(g) ) {
 		fprintf( stderr,
-			 "ttqm2ts warning: For some reason, I cannot save '%s'\n",
+			 "tqm2ts warning: For some reason, I cannot save '%s'\n",
 			 g.latin1() );
 	    } else {
 		if ( verbose ) {
@@ -109,13 +109,13 @@ int main( int argc, char **argv )
 		}
 		if ( ignored > 0 )
 		    fprintf( stderr,
-			     "ttqm2ts warning: File '%s' is not a TQt 2.x .qm"
+			     "tqm2ts warning: File '%s' is not a TQt 2.x .qm"
 			     " file (some information is lost)\n",
 			     argv[i] );
 	    }
 	} else {
 	    fprintf( stderr,
-		     "ttqm2ts warning: For some reason, I cannot load '%s'\n",
+		     "tqm2ts warning: For some reason, I cannot load '%s'\n",
 		     argv[i] );
 	}
     }
diff --git a/tools/linguist/tqm2ts/tqm2ts.1 b/tools/linguist/tqm2ts/tqm2ts.1
index daf2a428..bf49ca8e 100644
--- a/tools/linguist/tqm2ts/tqm2ts.1
+++ b/tools/linguist/tqm2ts/tqm2ts.1
@@ -1,4 +1,4 @@
-.TH ttqm2ts 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
+.TH tqm2ts 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
 .\"
 .\" Copyright (C) 2001-2008 Trolltech ASA.  All rights reserved.
 .\"
@@ -6,9 +6,9 @@
 .\" the terms and conditions described in the LICENSE file.
 .\"
 .SH NAME
-ttqm2ts \- generate Qt Linguist translation files from Qt 2.x message files
+tqm2ts \- generate Qt Linguist translation files from Qt 2.x message files
 .SH SYNOPSIS
-.B ttqm2ts
+.B tqm2ts
 .RI "[ " options " ] " qm-files
 .SH DESCRIPTION
 This page documents the
@@ -25,11 +25,11 @@ used with version control systems if required. It is understood by
 and
 .B Qt Linguist.
 .PP
-.B ttqm2ts
+.B tqm2ts
 is provided to ease porting from the old internationalization
 tools
-.B (tqttqtfindtr,
-.B tqttqtmergetr
+.B (tqtfindtr,
+.B tqtmergetr
 and
 .B msg2tqm)
 to the new ones. It will not accept Qt message files generated by
@@ -47,7 +47,7 @@ Explain what is being done.
 .TP
 .I "-version"
 Display the version of
-.B ttqm2ts
+.B tqm2ts
 and exit.
 .SH "SEE ALSO"
 .BR http://doc.trolltech.com/i18n.html
diff --git a/tools/linguist/tqm2ts/tqm2ts.pro b/tools/linguist/tqm2ts/tqm2ts.pro
index a68a8b82..4d1ee8e1 100644
--- a/tools/linguist/tqm2ts/tqm2ts.pro
+++ b/tools/linguist/tqm2ts/tqm2ts.pro
@@ -7,7 +7,7 @@ SOURCES		= main.cpp \
 DEFINES 	+= QT_INTERNAL_XML
 include( ../../../src/qt_professional.pri )
 
-TARGET		= ttqm2ts
+TARGET		= tqm2ts
 INCLUDEPATH	+= ../shared
 DESTDIR		= ../../../bin
 
diff --git a/tools/msg2tqm/msg2tqm.cpp b/tools/msg2tqm/msg2tqm.cpp
index 5b0e96a7..5bacda17 100644
--- a/tools/msg2tqm/msg2tqm.cpp
+++ b/tools/msg2tqm/msg2tqm.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** Copyright (C) 1998-2008 Trolltech ASA.  All rights reserved.
 **
-** This is a utility program for converting tqttqtfindtr msgfiles to
+** This is a utility program for converting tqtfindtr msgfiles to
 ** qtranslator message files
 **
 ** This file may be used under the terms of the GNU General
diff --git a/tools/tools.pro b/tools/tools.pro
index 2bd3da93..a790d717 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -7,7 +7,7 @@ no-png {
 		      assistant \
 		      linguist
     unix:SUBDIRS	+= qtconfig \
-			tqttqtmergetr \
+			tqtmergetr \
 			qconfig \
 			maketqpf \
 			msg2tqm \
diff --git a/tools/tqtmergetr/tqtmergetr.cpp b/tools/tqtmergetr/tqtmergetr.cpp
index bf2ae4d3..91296e37 100644
--- a/tools/tqtmergetr/tqtmergetr.cpp
+++ b/tools/tqtmergetr/tqtmergetr.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** Copyright (C) 1998-2008 Trolltech ASA.  All rights reserved.
 **
-** This is a utility program for merging tqttqtfindtr msgfiles
+** This is a utility program for merging tqtfindtr msgfiles
 **
 ** This file may be used under the terms of the GNU General
 ** Public License versions 2.0 or 3.0 as published by the Free
diff --git a/tools/tqtmergetr/tqtmergetr.pro b/tools/tqtmergetr/tqtmergetr.pro
index 767fa022..57b34d34 100644
--- a/tools/tqtmergetr/tqtmergetr.pro
+++ b/tools/tqtmergetr/tqtmergetr.pro
@@ -1,8 +1,8 @@
 TEMPLATE	= app
 CONFIG		+= console qt warn_on release
 HEADERS		=
-SOURCES		= tqttqtmergetr.cpp
-TARGET		= tqttqtmergetr
+SOURCES		= tqtmergetr.cpp
+TARGET		= tqtmergetr
 REQUIRES=full-config nocrosscompiler
 
 target.path = $$bins.path