diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-05 06:39:30 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 13:57:12 +0200 |
commit | 657c2bfbeceda3faa2c7a76b4ccec6a65a3445a2 (patch) | |
tree | 83e0a1dab04afb291e181bb8fb6152ba96678795 /tests/auto/tools/uic/baseline/batchtranslation.ui.h | |
parent | 676129d7ee57347798683d444823e7723776d8ec (diff) | |
parent | b94111116f09a6e48741d35cf7abea47af99ef26 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/testlib/selftests/generate_expected_output.py
Change-Id: If856162abf9a24ae2c9946d336a7d1da03520fa7
Diffstat (limited to 'tests/auto/tools/uic/baseline/batchtranslation.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/batchtranslation.ui.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/tools/uic/baseline/batchtranslation.ui.h b/tests/auto/tools/uic/baseline/batchtranslation.ui.h index 9d35f37b2a..87c140deff 100644 --- a/tests/auto/tools/uic/baseline/batchtranslation.ui.h +++ b/tests/auto/tools/uic/baseline/batchtranslation.ui.h @@ -216,16 +216,16 @@ public: void retranslateUi(QDialog *databaseTranslationDialog) { - databaseTranslationDialog->setWindowTitle(QApplication::translate("databaseTranslationDialog", "Qt Linguist - Batch Translation", 0)); - groupBox->setTitle(QApplication::translate("databaseTranslationDialog", "Options", 0)); - ckOnlyUntranslated->setText(QApplication::translate("databaseTranslationDialog", "Only translate entries with no translation", 0)); - ckMarkFinished->setText(QApplication::translate("databaseTranslationDialog", "Set translated entries to finished", 0)); - groupBox_2->setTitle(QApplication::translate("databaseTranslationDialog", "Phrase book preference", 0)); - moveUpButton->setText(QApplication::translate("databaseTranslationDialog", "Move up", 0)); - moveDownButton->setText(QApplication::translate("databaseTranslationDialog", "Move down", 0)); - label->setText(QApplication::translate("databaseTranslationDialog", "The batch translator will search through the selected phrasebooks in the order given above.", 0)); - runButton->setText(QApplication::translate("databaseTranslationDialog", "&Run", 0)); - cancelButton->setText(QApplication::translate("databaseTranslationDialog", "&Cancel", 0)); + databaseTranslationDialog->setWindowTitle(QApplication::translate("databaseTranslationDialog", "Qt Linguist - Batch Translation", Q_NULLPTR)); + groupBox->setTitle(QApplication::translate("databaseTranslationDialog", "Options", Q_NULLPTR)); + ckOnlyUntranslated->setText(QApplication::translate("databaseTranslationDialog", "Only translate entries with no translation", Q_NULLPTR)); + ckMarkFinished->setText(QApplication::translate("databaseTranslationDialog", "Set translated entries to finished", Q_NULLPTR)); + groupBox_2->setTitle(QApplication::translate("databaseTranslationDialog", "Phrase book preference", Q_NULLPTR)); + moveUpButton->setText(QApplication::translate("databaseTranslationDialog", "Move up", Q_NULLPTR)); + moveDownButton->setText(QApplication::translate("databaseTranslationDialog", "Move down", Q_NULLPTR)); + label->setText(QApplication::translate("databaseTranslationDialog", "The batch translator will search through the selected phrasebooks in the order given above.", Q_NULLPTR)); + runButton->setText(QApplication::translate("databaseTranslationDialog", "&Run", Q_NULLPTR)); + cancelButton->setText(QApplication::translate("databaseTranslationDialog", "&Cancel", Q_NULLPTR)); } // retranslateUi }; |