aboutsummaryrefslogtreecommitdiffstats
path: root/pylupdate
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2010-12-29 20:11:42 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2010-12-30 15:19:33 -0300
commit37e523670a02a25d08ec067df5df21173b5cca8b (patch)
tree5dac65ad631b6cb8c4a27311a45a0b9ecedfd122 /pylupdate
parentb6653bc9ad776f1b2f1f3f02d6fa97d3281aebb5 (diff)
Fixed error messages on pyside-lupdate.
They call the executable by its right name.
Diffstat (limited to 'pylupdate')
-rw-r--r--pylupdate/fetchtr.cpp14
-rw-r--r--pylupdate/main.cpp26
2 files changed, 20 insertions, 20 deletions
diff --git a/pylupdate/fetchtr.cpp b/pylupdate/fetchtr.cpp
index 7fff833..327d980 100644
--- a/pylupdate/fetchtr.cpp
+++ b/pylupdate/fetchtr.cpp
@@ -590,7 +590,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
if (!text.isEmpty())
{
- tor->insert(MetaTranslatorMessage(context, text, com,
+ tor->insert(MetaTranslatorMessage(context, text, com,
yyFileName, yyLineNo,
QStringList(), utf8,
MetaTranslatorMessage::Unfinished, plural));
@@ -638,7 +638,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
}
if (!text.isEmpty())
{
- tor->insert( MetaTranslatorMessage(context, text, com,
+ tor->insert( MetaTranslatorMessage(context, text, com,
yyFileName, yyLineNo,
QStringList(), utf8,
MetaTranslatorMessage::Unfinished,
@@ -668,7 +668,7 @@ static void parse( MetaTranslator *tor, const char *initialContext,
tor->insert( MetaTranslatorMessage(context, "", com,
yyFileName, yyLineNo,
QStringList(), false) );
-
+
}
}
yyTok = getToken();
@@ -692,7 +692,7 @@ void fetchtr_py( const char *fileName, MetaTranslator *tor,
char buf[100];
strerror_s(buf, sizeof(buf), errno);
fprintf( stderr,
- "pylupdate4 error: Cannot open Python source file '%s': %s\n",
+ "pyside-lupdate error: Cannot open Python source file '%s': %s\n",
fileName, buf );
}
#else
@@ -700,7 +700,7 @@ void fetchtr_py( const char *fileName, MetaTranslator *tor,
if ( yyInFile == 0 ) {
if ( mustExist )
fprintf( stderr,
- "pylupdate4 error: Cannot open Python source file '%s': %s\n",
+ "pyside-lupdate error: Cannot open Python source file '%s': %s\n",
fileName, strerror(errno) );
#endif
return;
@@ -823,10 +823,10 @@ void fetchtr_ui( const char *fileName, MetaTranslator *tor,
#if defined(_MSC_VER) && _MSC_VER >= 1400
char buf[100];
strerror_s(buf, sizeof(buf), errno);
- fprintf( stderr, "pylupdate4 error: cannot open UI file '%s': %s\n",
+ fprintf( stderr, "pyside-lupdate error: cannot open UI file '%s': %s\n",
fileName, buf );
#else
- fprintf( stderr, "pylupdate4 error: cannot open UI file '%s': %s\n",
+ fprintf( stderr, "pyside-lupdate error: cannot open UI file '%s': %s\n",
fileName, strerror(errno) );
#endif
}
diff --git a/pylupdate/main.cpp b/pylupdate/main.cpp
index 1140150..453f41e 100644
--- a/pylupdate/main.cpp
+++ b/pylupdate/main.cpp
@@ -54,8 +54,8 @@ typedef QList<MetaTranslatorMessage> TML;
static void printUsage()
{
fprintf( stderr, "Usage:\n"
- " pylupdate4 [options] project-file\n"
- " pylupdate4 [options] source-files -ts ts-files\n"
+ " pyside-lupdate [options] project-file\n"
+ " pyside-lupdate [options] source-files -ts ts-files\n"
"Options:\n"
" -help Display this information and exit\n"
" -noobsolete\n"
@@ -63,7 +63,7 @@ static void printUsage()
" -verbose\n"
" Explain what is being done\n"
" -version\n"
- " Display the version of pylupdate4 and exit\n" );
+ " Display the version of pyside-lupdate and exit\n" );
}
static void updateTsFiles( const MetaTranslator& fetchedTor,
@@ -81,7 +81,7 @@ static void updateTsFiles( const MetaTranslator& fetchedTor,
tor.setCodec( codecForTr.toLatin1() );
if ( verbose )
fprintf( stderr, "Updating '%s'...\n", fn.toLatin1().constData() );
-
+
merge( &tor, &fetchedTor, &out, verbose, noObsolete );
if ( noObsolete )
out.stripObsoleteMessages();
@@ -90,10 +90,10 @@ static void updateTsFiles( const MetaTranslator& fetchedTor,
#if defined(_MSC_VER) && _MSC_VER >= 1400
char buf[100];
strerror_s(buf, sizeof(buf), errno);
- fprintf( stderr, "pylupdate4 error: Cannot save '%s': %s\n",
+ fprintf( stderr, "pyside-lupdate error: Cannot save '%s': %s\n",
fn.toLatin1().constData(), buf );
#else
- fprintf( stderr, "pylupdate4 error: Cannot save '%s': %s\n",
+ fprintf( stderr, "pyside-lupdate error: Cannot save '%s': %s\n",
fn.toLatin1().constData(), strerror(errno) );
#endif
}
@@ -135,7 +135,7 @@ int main( int argc, char **argv )
verbose = true;
continue;
} else if ( qstrcmp(argv[i], "-version") == 0 ) {
- fprintf( stderr, "pylupdate4 version %s\n", QT_VERSION_STR );
+ fprintf( stderr, "pyside-lupdate version %s\n", QT_VERSION_STR );
return 0;
} else if ( qstrcmp(argv[i], "-ts") == 0 ) {
metTsFlag = true;
@@ -152,10 +152,10 @@ int main( int argc, char **argv )
#if defined(_MSC_VER) && _MSC_VER >= 1400
char buf[100];
strerror_s(buf, sizeof(buf), errno);
- fprintf( stderr, "pylupdate4 error: Cannot open file '%s': %s\n",
+ fprintf( stderr, "pyside-lupdate error: Cannot open file '%s': %s\n",
argv[i], buf );
#else
- fprintf( stderr, "pylupdate4 error: Cannot open file '%s': %s\n",
+ fprintf( stderr, "pyside-lupdate error: Cannot open file '%s': %s\n",
argv[i], strerror(errno) );
#endif
return 1;
@@ -207,12 +207,12 @@ int main( int argc, char **argv )
if ( !metSomething ) {
fprintf( stderr,
- "pylupdate4 warning: File '%s' does not look like a"
+ "pyside-lupdate warning: File '%s' does not look like a"
" project file\n",
argv[i] );
} else if ( tsFileNames.isEmpty() ) {
fprintf( stderr,
- "pylupdate4 warning: Met no 'TRANSLATIONS' entry in"
+ "pyside-lupdate warning: Met no 'TRANSLATIONS' entry in"
" project file '%s'\n",
argv[i] );
}
@@ -224,13 +224,13 @@ int main( int argc, char **argv )
tsFileNames.append( argv[i] );
} else {
fprintf( stderr,
- "pylupdate4 warning: For some reason, I cannot"
+ "pyside-lupdate warning: For some reason, I cannot"
" save '%s'\n",
argv[i] );
}
} else {
fprintf( stderr,
- "pylupdate4 error: File '%s' lacks .ts extension\n",
+ "pyside-lupdate error: File '%s' lacks .ts extension\n",
argv[i] );
}
} else {