summaryrefslogtreecommitdiffstats
path: root/tools/linguist/shared/translator.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
|\
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | implement --locations option (complementing lupdate)Oswald Buddenhagen2009-05-251-1/+1
| |
* | implement --no-ui-lines option (complementing lupdate)Oswald Buddenhagen2009-05-251-0/+1
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-021-2/+3
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * duplicate message handling improvementsOswald Buddenhagen2009-04-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - lrelease will not abort on duplicates any more - lconvert now gets noisy, but only if messages within one file are duplicated (combining files with identical messages is ok) - lupdate stays silent, but will eliminate duplicates again - consolidate handling of dual-encoded and duplicate messages - for performance - instead of the format loader, now the app is responsible for calling the duplicate handler. this allows for the fine-grained control necessary for optimal performance. Task-number: 247738
* | Merge branch '4.5'Thiago Macieira2009-03-271-3/+2
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: tools/linguist/lupdate/qscript.cpp tools/linguist/lupdate/qscript.g tools/linguist/lupdate/ui.cpp tools/linguist/shared/cpp.cpp tools/linguist/shared/qph.cpp tools/linguist/shared/translator.h
| * declare type info next to the type, not "somewhere"Oswald Buddenhagen2009-03-271-2/+0
| |
| * properly deal with messages which appear in multiple encodingsOswald Buddenhagen2009-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | in ts 1.1 and qm files, messages appear in their native encoding. that means that a message can appear multiple times - once in utf8 and once in the codecForTr. however, in ts 2.0 files, everything is utf8 and messages can have a utf8 flag for the later transformation into qm. unfortunately, there was no flag to mark that the message is needed in *both* encodings, and the respective case was completely ignored when reading ts 1.1 and qm files (causing error messages). Task-number: 249022 AutoTest: 322690
| * whitespaceOswald Buddenhagen2009-03-271-1/+1
| |
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+224
|
* Long live Qt!Lars Knoll2009-03-231-0/+229