diff options
| author | mread <qt-info@nokia.com> | 2009-08-07 13:34:12 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-07 13:34:12 (GMT) |
| commit | 5a72890b7ce12815f9567316da867006cff73f39 (patch) | |
| tree | 46c8c793f19274f9ed19678d1732d2123adbdf34 /tools/linguist/shared/ts.cpp | |
| parent | 0f6f1f841cea61cbb6905de92c2ca63bd369d55d (diff) | |
| parent | cc0a411e5e874aa224c26298a109973cb15ea291 (diff) | |
| download | Qt-5a72890b7ce12815f9567316da867006cff73f39.zip Qt-5a72890b7ce12815f9567316da867006cff73f39.tar.gz Qt-5a72890b7ce12815f9567316da867006cff73f39.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts fixed:
src/corelib/io/qdiriterator.cpp
Diffstat (limited to 'tools/linguist/shared/ts.cpp')
| -rw-r--r-- | tools/linguist/shared/ts.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/shared/ts.cpp b/tools/linguist/shared/ts.cpp index 3efce15..5884997 100644 --- a/tools/linguist/shared/ts.cpp +++ b/tools/linguist/shared/ts.cpp @@ -693,8 +693,8 @@ bool saveTS(const Translator &translator, QIODevice &dev, ConversionData &cd, in t << " type=\"obsolete\""; if (msg.isPlural()) { t << ">"; - QStringList translns = translator.normalizedTranslations(msg, cd, &result); - for (int j = 0; j < qMax(1, translns.count()); ++j) { + const QStringList &translns = msg.translations(); + for (int j = 0; j < translns.count(); ++j) { t << "\n <numerusform"; writeVariants(t, " ", translns[j]); t << "</numerusform>"; |