diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-25 17:56:33 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-25 17:56:33 (GMT) |
| commit | 5422e929cad04633a06c156cba96cfcd69262522 (patch) | |
| tree | afb3c9b76c05d80238a1ff76f4e8f4019fac1651 /tools/linguist | |
| parent | ac798c5d77c59ea8dfe29c9d1896fb6604e3a628 (diff) | |
| parent | a0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40 (diff) | |
| download | Qt-5422e929cad04633a06c156cba96cfcd69262522.zip Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.gz Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
configure
src/network/bearer/bearer.pri
Diffstat (limited to 'tools/linguist')
| -rw-r--r-- | tools/linguist/lupdate/qscript.cpp | 2 | ||||
| -rw-r--r-- | tools/linguist/lupdate/qscript.g | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/lupdate/qscript.cpp b/tools/linguist/lupdate/qscript.cpp index 1ff7e1c..e53c9dc 100644 --- a/tools/linguist/lupdate/qscript.cpp +++ b/tools/linguist/lupdate/qscript.cpp @@ -1530,7 +1530,7 @@ int QScript::Lexer::lex() } else { setDone(Bad); err = IllegalEscapeSequence; - errmsg = LU::tr("Illegal escape squence"); + errmsg = LU::tr("Illegal escape sequence"); } } else if (current == 'x') state = InHexEscape; diff --git a/tools/linguist/lupdate/qscript.g b/tools/linguist/lupdate/qscript.g index 66ec2c7..b8b7b5f 100644 --- a/tools/linguist/lupdate/qscript.g +++ b/tools/linguist/lupdate/qscript.g @@ -861,7 +861,7 @@ int QScript::Lexer::lex() } else { setDone(Bad); err = IllegalEscapeSequence; - errmsg = LU::tr("Illegal escape squence"); + errmsg = LU::tr("Illegal escape sequence"); } } else if (current == 'x') state = InHexEscape; |