diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-02-03 15:13:06 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-02-03 15:13:06 (GMT) |
| commit | acbbafc95096701ae0eb6917a5922a371cb37c69 (patch) | |
| tree | 854d1963cd20f94d92c5e1d2dbc97a7d38cc3f97 /tools/assistant | |
| parent | 7a4d0130441bae27a302e694828ec71ade9e6005 (diff) | |
| parent | 14054a47230d41063a10ce8fbf7dc65c916163d7 (diff) | |
| download | Qt-acbbafc95096701ae0eb6917a5922a371cb37c69.zip Qt-acbbafc95096701ae0eb6917a5922a371cb37c69.tar.gz Qt-acbbafc95096701ae0eb6917a5922a371cb37c69.tar.bz2 | |
Merge branch 'master' into qdoc-i18n
Diffstat (limited to 'tools/assistant')
| -rw-r--r-- | tools/assistant/lib/qhelpsearchquerywidget.cpp | 20 | ||||
| -rw-r--r-- | tools/assistant/translations/qt_help.pro | 1 | ||||
| -rw-r--r-- | tools/assistant/translations/translations.pro | 1 |
3 files changed, 12 insertions, 10 deletions
diff --git a/tools/assistant/lib/qhelpsearchquerywidget.cpp b/tools/assistant/lib/qhelpsearchquerywidget.cpp index ab48dac..ba7dc8d 100644 --- a/tools/assistant/lib/qhelpsearchquerywidget.cpp +++ b/tools/assistant/lib/qhelpsearchquerywidget.cpp @@ -121,17 +121,17 @@ private: void retranslate() { - simpleSearchLabel->setText(tr("Search for:")); - prevQueryButton->setToolTip(tr("Previous search")); - nextQueryButton->setToolTip(tr("Next search")); - searchButton->setText(tr("Search")); + simpleSearchLabel->setText(QHelpSearchQueryWidget::tr("Search for:")); + prevQueryButton->setToolTip(QHelpSearchQueryWidget::tr("Previous search")); + nextQueryButton->setToolTip(QHelpSearchQueryWidget::tr("Next search")); + searchButton->setText(QHelpSearchQueryWidget::tr("Search")); #ifdef QT_CLUCENE_SUPPORT - advancedSearchLabel->setText(tr("Advanced search")); - similarLabel->setText(tr("words <B>similar</B> to:")); - withoutLabel->setText(tr("<B>without</B> the words:")); - exactLabel->setText(tr("with <B>exact phrase</B>:")); - allLabel->setText(tr("with <B>all</B> of the words:")); - atLeastLabel->setText(tr("with <B>at least one</B> of the words:")); + advancedSearchLabel->setText(QHelpSearchQueryWidget::tr("Advanced search")); + similarLabel->setText(QHelpSearchQueryWidget::tr("words <B>similar</B> to:")); + withoutLabel->setText(QHelpSearchQueryWidget::tr("<B>without</B> the words:")); + exactLabel->setText(QHelpSearchQueryWidget::tr("with <B>exact phrase</B>:")); + allLabel->setText(QHelpSearchQueryWidget::tr("with <B>all</B> of the words:")); + atLeastLabel->setText(QHelpSearchQueryWidget::tr("with <B>at least one</B> of the words:")); #endif } diff --git a/tools/assistant/translations/qt_help.pro b/tools/assistant/translations/qt_help.pro index db54ae6..a641069 100644 --- a/tools/assistant/translations/qt_help.pro +++ b/tools/assistant/translations/qt_help.pro @@ -43,6 +43,7 @@ TR_DIR = $$PWD/../../../translations TRANSLATIONS = \ $$TR_DIR/qt_help_da.ts \ $$TR_DIR/qt_help_de.ts \ + $$TR_DIR/qt_help_hu.ts \ $$TR_DIR/qt_help_ja.ts \ $$TR_DIR/qt_help_pl.ts \ $$TR_DIR/qt_help_ru.ts \ diff --git a/tools/assistant/translations/translations.pro b/tools/assistant/translations/translations.pro index 95501ab..16d2010 100644 --- a/tools/assistant/translations/translations.pro +++ b/tools/assistant/translations/translations.pro @@ -45,6 +45,7 @@ TRANSLATIONS = \ $$TR_DIR/assistant_da.ts \ $$TR_DIR/assistant_de.ts \ $$TR_DIR/assistant_fr.ts \ + $$TR_DIR/assistant_hu.ts \ $$TR_DIR/assistant_ja.ts \ $$TR_DIR/assistant_pl.ts \ $$TR_DIR/assistant_ru.ts \ |