diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-03-27 21:26:54 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-03-27 21:26:54 (GMT) |
commit | 9748269cb58266fdfdac2c8820dad8c473dcf512 (patch) | |
tree | 81cdd7830afb6507429594e133e18ca9f420dd8c /tools/linguist/shared/po.cpp | |
parent | 9a33a0027883ab77c10d8a9d9d9df5b4c2c5d50b (diff) | |
parent | ba25c4a832516124bcd97758de9eede32797c5a0 (diff) | |
download | Qt-9748269cb58266fdfdac2c8820dad8c473dcf512.zip Qt-9748269cb58266fdfdac2c8820dad8c473dcf512.tar.gz Qt-9748269cb58266fdfdac2c8820dad8c473dcf512.tar.bz2 |
Merge branch '4.5'
Conflicts:
tools/linguist/lupdate/qscript.cpp
tools/linguist/lupdate/qscript.g
tools/linguist/lupdate/ui.cpp
tools/linguist/shared/cpp.cpp
tools/linguist/shared/qph.cpp
tools/linguist/shared/translator.h
Diffstat (limited to 'tools/linguist/shared/po.cpp')
-rw-r--r-- | tools/linguist/shared/po.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linguist/shared/po.cpp b/tools/linguist/shared/po.cpp index e9375e9..5842771 100644 --- a/tools/linguist/shared/po.cpp +++ b/tools/linguist/shared/po.cpp @@ -389,7 +389,7 @@ bool loadPO(Translator &translator, QIODevice &dev, ConversionData &cd) for (; l != lines.size(); ++l) { QString line = lines.at(l); if (line.isEmpty()) - continue; + continue; if (isTranslationLine(line)) { bool isObsolete = line.startsWith(QLatin1String("#~ msgstr")); const QString prefix = QLatin1String(isObsolete ? "#~ " : ""); |