diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-04-01 08:45:34 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-04-01 08:45:34 (GMT) |
| commit | 603ee8b841385c04c5118650075134154aee29a7 (patch) | |
| tree | 690a0b4abfa9a20551aab285cbb0fef49686c917 /tools/linguist/shared/xliff.cpp | |
| parent | d5e6111c62bc4437243fb1d6389e3af180f623d7 (diff) | |
| parent | 8ffd45cf6832b67960dbaa10654c4b84358fe3f9 (diff) | |
| download | Qt-603ee8b841385c04c5118650075134154aee29a7.zip Qt-603ee8b841385c04c5118650075134154aee29a7.tar.gz Qt-603ee8b841385c04c5118650075134154aee29a7.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7
Conflicts:
src/gui/text/qstatictext.cpp
Diffstat (limited to 'tools/linguist/shared/xliff.cpp')
| -rw-r--r-- | tools/linguist/shared/xliff.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/linguist/shared/xliff.cpp b/tools/linguist/shared/xliff.cpp index 20303ec..6411426 100644 --- a/tools/linguist/shared/xliff.cpp +++ b/tools/linguist/shared/xliff.cpp @@ -503,6 +503,8 @@ bool XLIFFHandler::startElement(const QString& namespaceURI, m_language.replace(QLatin1Char('-'), QLatin1Char('_')); m_sourceLanguage = atts.value(QLatin1String("source-language")); m_sourceLanguage.replace(QLatin1Char('-'), QLatin1Char('_')); + if (m_sourceLanguage == QLatin1String("en")) + m_sourceLanguage.clear(); } else if (localName == QLatin1String("group")) { if (atts.value(QLatin1String("restype")) == QLatin1String(restypeContext)) { m_context = atts.value(QLatin1String("resname")); |