diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-11 23:00:09 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-11 23:00:09 (GMT) |
| commit | 01c0eb33506cf319c089b77e709f4af0b68d8430 (patch) | |
| tree | bfea6bb20d8fbd1142e60783ccda3a4b33a3700c | |
| parent | d8b52dac5167bdf498d19d66ccb78fb12badf85a (diff) | |
| parent | 2aa21ab606a14ba63acb8f42fe4eb9f99ddad277 (diff) | |
| download | Qt-01c0eb33506cf319c089b77e709f4af0b68d8430.zip Qt-01c0eb33506cf319c089b77e709f4af0b68d8430.tar.gz Qt-01c0eb33506cf319c089b77e709f4af0b68d8430.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
| -rw-r--r-- | tools/linguist/linguist/messagemodel.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/linguist/linguist/messagemodel.cpp b/tools/linguist/linguist/messagemodel.cpp index 39ba9fd..c2edc75 100644 --- a/tools/linguist/linguist/messagemodel.cpp +++ b/tools/linguist/linguist/messagemodel.cpp @@ -209,6 +209,13 @@ bool DataModel::load(const QString &fileName, bool *langGuessed, QWidget *parent return false; } + if (!tor.messageCount()) { + QMessageBox::warning(parent, QObject::tr("Qt Linguist"), + tr("The translation file '%1' will not be loaded because it is empty.") + .arg(Qt::escape(fileName))); + return false; + } + Translator::Duplicates dupes = tor.resolveDuplicates(); if (!dupes.byId.isEmpty() || !dupes.byContents.isEmpty()) { QString err = tr("<qt>Duplicate messages found in '%1':").arg(Qt::escape(fileName)); |