diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2011-01-27 16:31:11 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2011-01-27 16:31:11 (GMT) |
| commit | d70d17a8ebea25a836e0fb101796cb70d5ca5efd (patch) | |
| tree | 0029a39fd51caf709a0e0086dc3da3dbe21ad929 /tools/linguist/lupdate | |
| parent | bbd87cfe022fab15a5cac555ce155f9caa27ff06 (diff) | |
| parent | 91f9b95b931f441e209ecb12c620e1657810f338 (diff) | |
| download | Qt-d70d17a8ebea25a836e0fb101796cb70d5ca5efd.zip Qt-d70d17a8ebea25a836e0fb101796cb70d5ca5efd.tar.gz Qt-d70d17a8ebea25a836e0fb101796cb70d5ca5efd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tools/linguist/lupdate')
| -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 beeec22..23fb9f6 100644 --- a/tools/linguist/lupdate/qscript.cpp +++ b/tools/linguist/lupdate/qscript.cpp @@ -1528,7 +1528,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 8be20d0..fb4eee7 100644 --- a/tools/linguist/lupdate/qscript.g +++ b/tools/linguist/lupdate/qscript.g @@ -859,7 +859,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; |