Revert "Update minor TQt3 tool names to match current TQt3 sources in GIT"

5 files changed, 17 insertions, 17 deletions

diff --git a/tools/linguist/book/linguist-manager.leaf b/tools/linguist/book/linguist-manager.leaf
index c35aa1a..aa99e01 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 tqm2ts, can be used for converting Qt 2.x message
+A third tool, \c qm2ts, 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 d34c386..3f1f286 100644
--- a/tools/linguist/linguist.pro
+++ b/tools/linguist/linguist.pro
@@ -5,7 +5,7 @@ SUBDIRS		= linguist \
 		  tutorial/tt3 \
 		  lrelease \
 		  lupdate \
-		  tqm2ts
+		  qm2ts
 CONFIG += ordered
 
 REQUIRES=full-config nocrosscompiler
diff --git a/tools/linguist/qm2ts/main.cpp b/tools/linguist/qm2ts/main.cpp
index 3cd00ca..e04c99c 100644
--- a/tools/linguist/qm2ts/main.cpp
+++ b/tools/linguist/qm2ts/main.cpp
@@ -42,13 +42,13 @@ typedef QValueList<QTranslatorMessage> TML;
 static void printUsage()
 {
     fprintf( stderr, "Usage:\n"
-	     "    tqm2ts [ options ] qm-files\n"
+	     "    qm2ts [ 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 tqm2ts and exit\n" );
+	     "           Display the version of qm2ts 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, "tqm2ts version %s\n", QT_VERSION_STR );
+	    fprintf( stderr, "qm2ts version %s\n", QT_VERSION_STR );
 	    return 0;
 	}
 
@@ -99,7 +99,7 @@ int main( int argc, char **argv )
 
 	    if ( !metator.save(g) ) {
 		fprintf( stderr,
-			 "tqm2ts warning: For some reason, I cannot save '%s'\n",
+			 "qm2ts 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,
-			     "tqm2ts warning: File '%s' is not a Qt 2.x .qm"
+			     "qm2ts warning: File '%s' is not a Qt 2.x .qm"
 			     " file (some information is lost)\n",
 			     argv[i] );
 	    }
 	} else {
 	    fprintf( stderr,
-		     "tqm2ts warning: For some reason, I cannot load '%s'\n",
+		     "qm2ts warning: For some reason, I cannot load '%s'\n",
 		     argv[i] );
 	}
     }
diff --git a/tools/linguist/qm2ts/qm2ts.1 b/tools/linguist/qm2ts/qm2ts.1
index bf49ca8..e1eb472 100644
--- a/tools/linguist/qm2ts/qm2ts.1
+++ b/tools/linguist/qm2ts/qm2ts.1
@@ -1,4 +1,4 @@
-.TH tqm2ts 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*-
+.TH qm2ts 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
-tqm2ts \- generate Qt Linguist translation files from Qt 2.x message files
+qm2ts \- generate Qt Linguist translation files from Qt 2.x message files
 .SH SYNOPSIS
-.B tqm2ts
+.B qm2ts
 .RI "[ " options " ] " qm-files
 .SH DESCRIPTION
 This page documents the
@@ -25,13 +25,13 @@ used with version control systems if required. It is understood by
 and
 .B Qt Linguist.
 .PP
-.B tqm2ts
+.B qm2ts
 is provided to ease porting from the old internationalization
 tools
-.B (tqtfindtr,
-.B tqtmergetr
+.B (findtr,
+.B mergetr
 and
-.B msg2tqm)
+.B msg2qm)
 to the new ones. It will not accept Qt message files generated by
 .B lrelease,
 as
@@ -47,7 +47,7 @@ Explain what is being done.
 .TP
 .I "-version"
 Display the version of
-.B tqm2ts
+.B qm2ts
 and exit.
 .SH "SEE ALSO"
 .BR http://doc.trolltech.com/i18n.html
diff --git a/tools/linguist/qm2ts/qm2ts.pro b/tools/linguist/qm2ts/qm2ts.pro
index 4d1ee8e..3868e30 100644
--- a/tools/linguist/qm2ts/qm2ts.pro
+++ b/tools/linguist/qm2ts/qm2ts.pro
@@ -7,7 +7,7 @@ SOURCES		= main.cpp \
 DEFINES 	+= QT_INTERNAL_XML
 include( ../../../src/qt_professional.pri )
 
-TARGET		= tqm2ts
+TARGET		= qm2ts
 INCLUDEPATH	+= ../shared
 DESTDIR		= ../../../bin