diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-29 03:08:40 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-29 03:08:40 (GMT) |
| commit | 2eb60d000f3666fc42ba2b7305ca52556497c86a (patch) | |
| tree | 95e1821e89fcbfa5ccaa4bcbd5673127ee801243 /tools/linguist/lupdate | |
| parent | 9065cdc07a6745fc269d7ec3aba457d48858267c (diff) | |
| parent | 9088aeae9daf02546769377853824397458ba822 (diff) | |
| download | Qt-2eb60d000f3666fc42ba2b7305ca52556497c86a.zip Qt-2eb60d000f3666fc42ba2b7305ca52556497c86a.tar.gz Qt-2eb60d000f3666fc42ba2b7305ca52556497c86a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
tools/qdoc3/doc.cpp
Diffstat (limited to 'tools/linguist/lupdate')
| -rw-r--r-- | tools/linguist/lupdate/merge.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/linguist/lupdate/merge.cpp b/tools/linguist/lupdate/merge.cpp index c4f4448..4849d6e 100644 --- a/tools/linguist/lupdate/merge.cpp +++ b/tools/linguist/lupdate/merge.cpp @@ -193,7 +193,7 @@ static QString translationAttempt(const QString &oldTranslation, */ for (k = 0; k < p; k++) { if (!met[k]) - attempt += QString(QLatin1String(" {")) + newNumbers[k] + QString(QLatin1String("?}")); + attempt += QLatin1String(" {") + newNumbers[k] + QLatin1String("?}"); } /* @@ -205,8 +205,8 @@ static QString translationAttempt(const QString &oldTranslation, for (ell = 0; ell < p; ell++) { if (k != ell && oldNumbers[k] == oldNumbers[ell] && newNumbers[k] < newNumbers[ell]) - attempt += QString(QLatin1String(" {")) + newNumbers[k] + QString(QLatin1String(" or ")) + - newNumbers[ell] + QString(QLatin1String("?}")); + attempt += QLatin1String(" {") + newNumbers[k] + QLatin1String(" or ") + + newNumbers[ell] + QLatin1String("?}"); } } return attempt; |