summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate/merge.cpp
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* Wrap translatable messages with tr() in assistant, designer and linguistVictor Ostashevsky2010-09-011-7/+11
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-131-1/+1
|\
| * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* | fix sametext and number heuristicsOswald Buddenhagen2010-01-061-45/+46
* | fix number heuristics, part 1Oswald Buddenhagen2010-01-061-2/+2
|/
* record id-based messages even if they have an empty sourceOswald Buddenhagen2009-11-061-3/+3
* handle messages with ids (more) correctlyOswald Buddenhagen2009-11-061-15/+29
* kill TranslatorMessage::operator==() and qHash(TranslatorMessage)Oswald Buddenhagen2009-11-061-2/+2
* eliminate Translator::replace()Oswald Buddenhagen2009-11-061-7/+3
* cut code dupe ...Oswald Buddenhagen2009-11-061-12/+5
* don't construct a new message for look-up purposes onlyOswald Buddenhagen2009-11-061-3/+5
* Update license headers again.Jason McDonald2009-09-091-4/+4
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
* Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
* improved string operations all over the placeThierry Bastian2009-05-281-3/+3
* Merge branch '4.5'Thiago Macieira2009-03-271-2/+2
* Long live Qt!Lars Knoll2009-03-231-0/+505