summaryrefslogtreecommitdiffstats
path: root/tools/linguist
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-2711-46/+105
|\
| * 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
| |/
| * don't use qWarning for things which are not really warningsOswald Buddenhagen2009-11-202-6/+15
| * fix crash on closing "rightmost" fileOswald Buddenhagen2009-11-201-2/+4
| * fix encodings, take NOswald Buddenhagen2009-11-203-17/+21
| * 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
| * 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
* | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-197-29/+200
|\ \ \ | |/ /
| * | Updates the french translation of qt strings in qt_fr.tsPierre Rossi2009-11-181-2/+38
| * | fix linking following lrelease bootstrappingOswald Buddenhagen2009-11-131-0/+2
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-131-0/+20
| |\ \ | | |/
| * | build lrelease bootstrappedOswald Buddenhagen2009-11-106-11/+145
| * | don't use qApp->arguments()Oswald Buddenhagen2009-11-101-16/+15
* | | Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-1112-191/+249
|\ \ \ | | |/ | |/|
| * | french translation of qt_helpPierre Rossi2009-11-101-0/+20
| |/
| * record id-based messages even if they have an empty sourceOswald Buddenhagen2009-11-063-20/+16
| * handle messages with ids (more) correctlyOswald Buddenhagen2009-11-064-52/+138
| * kill TranslatorMessage::operator==() and qHash(TranslatorMessage)Oswald Buddenhagen2009-11-065-29/+27
| * eliminate TranslatorMessagePtr from the Translator apiOswald Buddenhagen2009-11-066-48/+51
| * improve ordered message insertionOswald Buddenhagen2009-11-061-1/+1
| * eliminate Translator::contains()Oswald Buddenhagen2009-11-063-11/+11
| * eliminate Translator::replace()Oswald Buddenhagen2009-11-063-17/+3
| * use right method to record new messagesOswald Buddenhagen2009-11-061-1/+1
| * do not consider plural source in comparisonsOswald Buddenhagen2009-11-061-4/+0
| * remove unused TranslatorMessage::operator<()Oswald Buddenhagen2009-11-062-12/+0
| * cut code dupe ...Oswald Buddenhagen2009-11-061-12/+5
| * don't construct a new message for look-up purposes onlyOswald Buddenhagen2009-11-063-13/+5
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-094-83/+112
|\ \ | |/
| * add -markuntranslated optionOswald Buddenhagen2009-11-043-16/+29
| * reshuffle command line parsingOswald Buddenhagen2009-11-041-16/+12
| * construct ConversionData earlierOswald Buddenhagen2009-11-041-31/+21
| * don't break on unterminated C commentsOswald Buddenhagen2009-11-041-1/+1
| * introduce delayed resolution of aliasesOswald Buddenhagen2009-11-041-16/+41
| * fix bogus "Class '<foo>' lacks Q_OBJECT macro"Oswald Buddenhagen2009-11-041-3/+3
| * namespaces can have parents, tooOswald Buddenhagen2009-11-041-5/+10
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-043-5/+28
|\ \ | |/
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-021-0/+20
| |\
| | * Add a French translation to Assistant. Update the phrase book.Benjamin Poulain2009-10-301-0/+20
| * | Make Linguist on Mac use the unified toolbar, like Assistant.Daniel Molkentin2009-10-301-0/+1
| |/
| * do not crashOswald Buddenhagen2009-10-291-5/+7
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-301-9/+9
|\ \
| * \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2009-10-291-9/+9
| |\ \ | | |/
| | * make magic comment parsing stricterOswald Buddenhagen2009-10-281-9/+9
* | | fix headersWarwick Allison2009-10-291-16/+16
|/ /
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-253-6/+13
|\ \ | |/
| * consider message id when comparing messagesOswald Buddenhagen2009-10-221-2/+6