summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-02-24 14:44:32 (GMT)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-02-24 14:44:32 (GMT)
commitdb4f71fc4c7b29a4a37545a52a71269886db0210 (patch)
tree817f044d5064fc497236c309488e4bd63218e5c8 /tools
parent4b344fd9f4eec8cb4271f38e8dfdc88905375e66 (diff)
downloadQt-db4f71fc4c7b29a4a37545a52a71269886db0210.zip
Qt-db4f71fc4c7b29a4a37545a52a71269886db0210.tar.gz
Qt-db4f71fc4c7b29a4a37545a52a71269886db0210.tar.bz2
tr()-Fixes in Assistant/QHelpLib code.
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/lib/qhelpsearchresultwidget.cpp2
-rw-r--r--tools/assistant/tools/assistant/bookmarkmanager.cpp2
-rw-r--r--tools/assistant/tools/assistant/cmdlineparser.cpp16
3 files changed, 10 insertions, 10 deletions
diff --git a/tools/assistant/lib/qhelpsearchresultwidget.cpp b/tools/assistant/lib/qhelpsearchresultwidget.cpp
index 8e476d5..2f5489b 100644
--- a/tools/assistant/lib/qhelpsearchresultwidget.cpp
+++ b/tools/assistant/lib/qhelpsearchresultwidget.cpp
@@ -304,7 +304,7 @@ private:
last = resultLastToShow > count ? count : resultLastToShow;
}
}
- hitsLabel->setText(QHelpSearchResultWidget::tr("%1 - %2 of %3 Hits").arg(first).arg(last).arg(count));
+ hitsLabel->setText(QHelpSearchResultWidget::tr("%1 - %2 of %n Hits", 0, count).arg(first).arg(last));
}
private:
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp
index 70f562e..b9a1b0e 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp
@@ -148,7 +148,7 @@ void BookmarkManager::takeBookmarksMenu(QMenu* menu)
void BookmarkManager::addBookmark(const QString &title, const QString &url)
{
TRACE_OBJ
- showBookmarkDialog(title.isEmpty() ? tr("Untiled") : title,
+ showBookmarkDialog(title.isEmpty() ? tr("Untitled") : title,
url.isEmpty() ? QLatin1String("about:blank") : url);
}
diff --git a/tools/assistant/tools/assistant/cmdlineparser.cpp b/tools/assistant/tools/assistant/cmdlineparser.cpp
index bbc0c37..b6c0beb 100644
--- a/tools/assistant/tools/assistant/cmdlineparser.cpp
+++ b/tools/assistant/tools/assistant/cmdlineparser.cpp
@@ -167,10 +167,10 @@ void CmdLineParser::handleCollectionFileOption()
const QString &fileName = nextArg();
m_collectionFile = getFileName(fileName);
if (m_collectionFile.isEmpty())
- m_error = tr("The collection file '%1' does not exist!").
+ m_error = tr("The collection file '%1' does not exist.").
arg(fileName);
} else {
- m_error = tr("Missing collection file!");
+ m_error = tr("Missing collection file.");
}
}
@@ -183,9 +183,9 @@ void CmdLineParser::handleShowUrlOption()
if (url.isValid()) {
m_url = url;
} else
- m_error = tr("Invalid URL '%1'!").arg(urlString);
+ m_error = tr("Invalid URL '%1'.").arg(urlString);
} else {
- m_error = tr("Missing URL!");
+ m_error = tr("Missing URL.");
}
}
@@ -223,7 +223,7 @@ void CmdLineParser::handleShowOrHideOrActivateOption(ShowState state)
else
m_error = tr("Unknown widget: %1").arg(widget);
} else {
- m_error = tr("Missing widget!");
+ m_error = tr("Missing widget.");
}
}
@@ -246,11 +246,11 @@ void CmdLineParser::handleRegisterOrUnregisterOption(RegisterState state)
const QString &fileName = nextArg();
m_helpFile = getFileName(fileName);
if (m_helpFile.isEmpty())
- m_error = tr("The Qt help file '%1' does not exist!").arg(fileName);
+ m_error = tr("The Qt help file '%1' does not exist.").arg(fileName);
else
m_register = state;
} else {
- m_error = tr("Missing help file!");
+ m_error = tr("Missing help file.");
}
}
@@ -260,7 +260,7 @@ void CmdLineParser::handleSetCurrentFilterOption()
if (hasMoreArgs())
m_currentFilter = nextArg();
else
- m_error = tr("Missing filter argument!");
+ m_error = tr("Missing filter argument.");
}
QString CmdLineParser::getFileName(const QString &fileName)