From 68be876cbe7b098acf037a7d6b6eafcfb162d9db Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 27 Sep 2011 09:38:53 +0200
Subject: [PATCH] tr()-Fixes for 2.4.
Change-Id: Ieee648b38687a1d8e88ab1ddf887f2f5908aaa05
Reviewed-on: http://codereview.qt-project.org/5597
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
src/plugins/madde/maemopackagecreationstep.cpp | 2 +-
src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/madde/maemopackagecreationstep.cpp b/src/plugins/madde/maemopackagecreationstep.cpp
index ee2f8901498..44055c681ba 100644
--- a/src/plugins/madde/maemopackagecreationstep.cpp
+++ b/src/plugins/madde/maemopackagecreationstep.cpp
@@ -301,7 +301,7 @@ bool MaemoDebianPackageCreationStep::createPackage(QProcess *buildProc,
QFile::remove(changesTargetFilePath);
if (!QFile::rename(packageSourceFilePath, packageFilePath())
|| !QFile::rename(changesSourceFilePath, changesTargetFilePath)) {
- raiseError(tr("Packaging failed: Could not move package files from '%1'' to '%2'.")
+ raiseError(tr("Packaging failed: Could not move package files from '%1' to '%2'.")
.arg(packageSourceDir, packageDirectory()));
return false;
}
diff --git a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
index 59a8a982d7e..b1f4acc2dc9 100644
--- a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
+++ b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
@@ -233,9 +233,9 @@ protected:
_doc->fileName(),
line, column,
FindExportedCppTypes::tr(
- "The module uri cannot be determined by static analysis. The type will be available\n"
+ "The module URI cannot be determined by static analysis. The type will be available\n"
"globally in the QML editor. You can add a \"// @uri My.Module.Uri\" annotation to let\n"
- "Qt Creator know about a likely uri."));
+ "Qt Creator know about a likely URI."));
}
// second and third argument must be integer literals
@@ -365,7 +365,7 @@ protected:
_doc->fileName(),
line, column,
FindExportedCppTypes::tr(
- "must be a string literal to be available in qml editor"));
+ "must be a string literal to be available in the QML editor"));
return false;
}
--
GitLab