diff options
author | Martin Smith <martin.smith@nokia.com> | 2011-02-24 10:48:32 (GMT) |
---|---|---|
committer | Martin Smith <martin.smith@nokia.com> | 2011-02-24 10:48:32 (GMT) |
commit | e51fda7db531628b54297ae020dda4a5f962d394 (patch) | |
tree | 846fa261f80459529235e890ed897cf6186e9351 /tools/linguist/lupdate/qscript.g | |
parent | 66aba9ad196c24d6844e39901bf152d0951ccfb7 (diff) | |
parent | c881e33e7e510204fabd061dac08a00b10b432fb (diff) | |
download | Qt-e51fda7db531628b54297ae020dda4a5f962d394.zip Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.gz Qt-e51fda7db531628b54297ae020dda4a5f962d394.tar.bz2 |
Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir
Diffstat (limited to 'tools/linguist/lupdate/qscript.g')
-rw-r--r-- | tools/linguist/lupdate/qscript.g | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/lupdate/qscript.g b/tools/linguist/lupdate/qscript.g index 3655f2e..fb4eee7 100644 --- a/tools/linguist/lupdate/qscript.g +++ b/tools/linguist/lupdate/qscript.g @@ -1,6 +1,6 @@ ---------------------------------------------------------------------------- -- --- Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +-- Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -- All rights reserved. -- Contact: Nokia Corporation (qt-info@nokia.com) -- @@ -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; |