summaryrefslogtreecommitdiffstats
path: root/tools/linguist
Commit message (Collapse)AuthorAgeFilesLines
* optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-011-1/+1
| | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly pointless when converting internal data structures which are raw utf16 in host byte order anyway. so replace it with QString::fromRawData() (for short-lived strings) or QString(const QChar *, int) (otherwise) if possible. Reviewed-by: axis Reviewed-by: mariusSO Reviewed-by: Bill King
* don't falsely complain about mismatched codecfortrOswald Buddenhagen2010-01-272-13/+14
| | | | normalize the user input first
* add directories with sources to list of project rootsOswald Buddenhagen2010-01-271-3/+12
| | | | | | | | if the pro file for the translations lives in a sibling tree of the actual source tree, messages from included headers wouldn't have been collected, as they were not considered part of the project. Task-number: QTBUG-7495
* add -codecfortr optionOswald Buddenhagen2010-01-271-2/+17
| | | | this has always been kind of an omission ...
* sanitize lupdate's behavior regarding SUBDIRS projectsOswald Buddenhagen2010-01-271-95/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | previously, the semantics of nesting projects were pretty bizarre: the list of TS files grew ever as the subdirs were visited. the source files otoh were cleared for every project. this meant that some TS files were updated over and over again, each time with different data. this is obviously total nonsense, so there is no compatibilty to keep. so here come the new semantics: - each project is scanned separately. it has separate include paths and may override the inherited CODECFORSRC. - the messages from all sub-projects are merged - if a sub-project has a TRANSLATIONS entry, it is "detached" from its parent project, thus starting an own merged translator. it is also possible to name an empty set of TS files to simply exclude the sub-project. - CODECFORTR can be specified in each project with TRANSLATIONS - if TS files are specified on the command line, they override TRANSLATIONS from the top level project and stop processing of detached projects alltogether. if multiple top-level projects are specified, they are all merged. this is somewhat slower, as now includes are re-scanned per project, while previously all sources were simply accumulated and scanned as one project. this can be fixed retroactively if needed.
* unshare pro post-processing codeOswald Buddenhagen2010-01-275-216/+73
| | | | | lrelease needs only the TRANSLATIONS value anyway, so there is hardly anything to share for real
* complain if both sources and projects are given on the cmdlineOswald Buddenhagen2010-01-271-0/+4
|
* still complain if only ts files where specified on the cmdlineOswald Buddenhagen2010-01-271-7/+7
|
* do not sort the TS filesOswald Buddenhagen2010-01-272-3/+1
| | | | really no point in doing so ...
* fix bogus warning messageOswald Buddenhagen2010-01-271-4/+1
|
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-1385-86/+86
|\ | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testlupdate.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-0785-86/+86
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QIODevice: Fix readAll() Temporary hackiesh solution to prevent BOM in the xml data. Fixed qxmlstream autotest when using shadow builds. Attempt at readding the capital P headers for Phonon Remove special Phonon processing from syncqt. Use the lowercase/shortname.h headers for Phonon includes Fixes a crash when setting focus on a widget with a focus proxy. Update copyright year to 2010 doc: Clarified activeSubControls and subControls. Remove warning "statement with no effect" doc: Clarified that .lnk files are System files on Windows.
| | * Update copyright year to 2010Jason McDonald2010-01-0685-86/+86
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | QFile cannot deal with crlf-translated stdio, so use binary modeOswald Buddenhagen2010-01-121-0/+12
| | | | | | | | | | | | | | | | | | | | | of course, this will break if somebody actually pipes in windows files. oh, well. Suggested-by: joao
* | | don't complain about unresolved base when the reference is absoluteOswald Buddenhagen2010-01-071-1/+1
| | | | | | | | | | | | Task-number: QTBUG-6072
* | | fix sametext and number heuristicsOswald Buddenhagen2010-01-061-45/+46
| | | | | | | | | | | | | | | | | | | | | 92e9a48 ("eliminate Translator::replace()") eliminated the correctness as well. whoops. this code should be more efficient as well ...
* | | fix number heuristics, part 1Oswald Buddenhagen2010-01-061-2/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | remove dead codeOswald Buddenhagen2010-01-061-8/+0
|/ /
* | do not accumulate messagesOswald Buddenhagen2010-01-041-2/+3
|/ | | | Task-number: QTBUG-6588
* fix build with namespaced qtOswald Buddenhagen2009-12-161-0/+2
|
* Fix precision loss warning (qreal vs. float on Windows)Alessandro Portale2009-12-151-1/+1
| | | | | | Reviewed-by: Oswald Buddenhagen modified: tools/linguist/linguist/messageeditor.h
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-12-037-32/+76
|\
| * fix crash on closing all files under certain circumstancesOswald Buddenhagen2009-11-263-11/+11
| | | | | | | | | | | | | | after all, it is no good idea to announce the removal of all columns just to let the view headers adjust themselves - it also makes the views emit currentItemChanged() which has some undesirable side effects. so don't do it an fix the header manually.
| * ignore Alt+Space acelerators - useless and too many false positivesOswald Buddenhagen2009-11-261-2/+13
| | | | | | | | Task-number: QTBUG-4429
| * offer only possible countries for each languageOswald Buddenhagen2009-11-252-8/+27
| | | | | | | | | | otherwise qlocale will silently clobber the user's (most probably bogus) choice anyway.
| * make qph use language attributesOswald Buddenhagen2009-11-251-5/+18
| |
| * the definition needs xml escaping, tooOswald Buddenhagen2009-11-251-1/+1
| |
| * don't write context into <definition> fieldOswald Buddenhagen2009-11-251-3/+2
| | | | | | | | | | | | there is really no point in doing so Reviewed-by: hjk
| * qph: don't clobber <definition> fieldsOswald Buddenhagen2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | the translator comment field is not written out, so reading the definition into it is basically discarding it as far as any roundtrips which arrive at qph again are concerned. the message's disambiguation seems most suitable for the task. Reviewed-by: hjk Task-number: QTBUG-4498
| * fix class/struct mismatch in the bootstrap magicOswald Buddenhagen2009-11-251-2/+4
| | | | | | | | | | | | qlocale.h includes qobjectdefs.h which forward-declares it as a class. Reviewed-by: aportale
* | Make lrelease link again with the win32-icc and win32-g++ mkspecsJan-Arve Sæther2009-12-031-1/+1
|/ | | | Reviewed-by: Thierry
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-251-0/+36
|\
| * updates french phrasebookPierre Rossi2009-11-231-0/+36
| |
* | Fix build on AIX: all of the .a file is linked into the program.Oswald Buddenhagen2009-11-241-0/+7
|/ | | | | | | | | The qlibraryinfo.cpp is only needed by lrelease. It has a hack for qmake_libraryInfoFile(), which doesn't work on AIX. So don't put qlibraryinfo.cpp in libbootstrap.a, but instead build directly for lrelease. Reviewed-by: thiago
* don't use qWarning for things which are not really warningsOswald Buddenhagen2009-11-202-6/+15
| | | | | | | | | ... so the tools are usable with QT_FATAL_WARNINGS. it may be sensible to "degrade" the c++ parser warnings to info messages. possibly later ... Task-number: QTBUG-5683
* fix crash on closing "rightmost" fileOswald Buddenhagen2009-11-201-2/+4
| | | | | | "This cannot happen" ... yeah, right. :} Task-number: QTBUG-5989
* fix encodings, take NOswald Buddenhagen2009-11-203-17/+21
| | | | | Task-number: QTBUG-4499 Task-number: QTBUG-5276
* don't overwrite explicitly specified CODECFORTR on UTF-16 inputOswald Buddenhagen2009-11-193-2/+3
|
* fix potentially wrong output codec for UTF-16 input filesOswald Buddenhagen2009-11-191-1/+1
| | | | querying the actual codec before the file has been read is pointless
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-194-18/+18
|\
| * Ran the script utils/normalizeOlivier Goffart2009-11-184-18/+18
| | | | | | | | Over src/ tools/ examples/ and demos/
* | Updates the french translation of qt strings in qt_fr.tsPierre Rossi2009-11-181-2/+38
| | | | | | | | | | | | | | Also took care of placing non breakable spaces before double punctuation characters. Reviewed-by: Benjamin Poulain
* | fix linking following lrelease bootstrappingOswald Buddenhagen2009-11-131-0/+2
| | | | | | | | qsettings_win needs advapi32
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-131-0/+20
|\ \ | |/
| * french translation of qt_helpPierre Rossi2009-11-101-0/+20
| |
* | build lrelease bootstrappedOswald Buddenhagen2009-11-106-11/+145
| | | | | | | | | | | | | | | | needed for build-time qm generation in qt itself. the downsides are a) that the other bootstrapped tools grow by ~12kB (on x86) due to qdatastream being pulled in by qbytearray and qstring and b) that lrelease isn't l10n'd itself anymore (the latter could be fixed by building a non-qobject qtranslator).
* | don't use qApp->arguments()Oswald Buddenhagen2009-11-101-16/+15
|/ | | | preparation work for bootstrapping
* record id-based messages even if they have an empty sourceOswald Buddenhagen2009-11-063-20/+16
| | | | | | this makes sense if one uses lupdate only for validation purposes, i.e. to find out if the code uses only ids which are defined in some external specification.
* handle messages with ids (more) correctlyOswald Buddenhagen2009-11-064-52/+138
| | | | | when comparing two messages which both have ids, compare only the ids. this affects finding/reporting duplicates and merging.
* kill TranslatorMessage::operator==() and qHash(TranslatorMessage)Oswald Buddenhagen2009-11-065-29/+27
| | | | preparation work ...