diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-20 13:51:58 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-20 13:51:58 +0200 |
| commit | 1a632e1bc677fce4b8d5450ce4a971fdde3ed42f (patch) | |
| tree | 222c48a9d90097b3ea61cb2839b6541eff185c3a /tools/linguist/shared/translator.h | |
| parent | 9bd8df2b405ef517d2d1b209b8004aaaa4994242 (diff) | |
| parent | 3d6381b47a6048d04dbfc7b6984cae81c02d4fe6 (diff) | |
Merge commit 'origin/4.5'
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp
src/3rdparty/webkit/WebCore/page/DOMWindow.idl
src/corelib/io/qdiriterator.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
tests/auto/qxmlquery/tst_qxmlquery.cpp
tools/linguist/lconvert/main.cpp
Diffstat (limited to 'tools/linguist/shared/translator.h')
| -rw-r--r-- | tools/linguist/shared/translator.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index fb17fd1cdd..d0903a90f4 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -84,7 +84,8 @@ public: public: QString m_defaultContext; - QByteArray m_codecForSource; // CPP specific + QByteArray m_codecForSource; // CPP, PO & QM specific + QByteArray m_outputCodec; // PO specific QString m_sourceFileName; QString m_targetFileName; QDir m_sourceDir; @@ -158,8 +159,8 @@ public: static QString guessLanguageCodeFromFileName(const QString &fileName); QList<TranslatorMessage> messages() const; QList<TranslatorMessage> translatedMessages() const; - static QStringList normalizedTranslations(const TranslatorMessage &m, - QLocale::Language lang, QLocale::Country country); + static QStringList normalizedTranslations(const TranslatorMessage &m, int numPlurals); + void normalizeTranslations(ConversionData &cd); QStringList normalizedTranslations(const TranslatorMessage &m, ConversionData &cd, bool *ok) const; int messageCount() const { return m_messages.size(); } |