summaryrefslogtreecommitdiffstats
path: root/tools/linguist/shared
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-231-3/+20
|\ | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| * mark plural messages as such in the qm readerOswald Buddenhagen2009-06-231-0/+18
| | | | | | | | | | | | this contains both a "clean" code path based on translation count and a fallback path based on looking for "%n" (for languages with only one form).
| * add -input-codec option for qm readerOswald Buddenhagen2009-06-231-3/+2
| | | | | | | | | | basing the input codec on the locale was broken by design and didn't really work anyway. so adding this option really is a bugfix, kind of.
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-1618-42/+37
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-1625-50/+50
| | | | | | | | Reviewed-by: Trust Me
| * no point in ProFile being a QObjectOswald Buddenhagen2009-06-151-4/+1
| |
| * remove unused includesOswald Buddenhagen2009-06-152-2/+0
| |
* | purge dead codeOswald Buddenhagen2009-06-151-18/+4
| |
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| * fix arabic pluralsOswald Buddenhagen2009-06-111-2/+2
| |
| * add plural rules for urduOswald Buddenhagen2009-06-111-0/+1
| |
| * don't let comments weaved into strings confuse usOswald Buddenhagen2009-06-101-1/+3
| | | | | | | | | | | | Reviewed-by: TrustMe Task-number: 254260 Testcase: 323072@p4
| * explicitly handle windows and mac9 line endingsOswald Buddenhagen2009-06-051-5/+20
| | | | | | | | | | | | in practice, this matters only for backslashed line continuations Task-number: 255336
* | Merge commit 'origin/4.5'Olivier Goffart2009-06-041-19/+27
|\ \ | |/
| * fix catalan plural rulesOswald Buddenhagen2009-06-031-2/+7
| |
| * rename some plural formsOswald Buddenhagen2009-06-031-4/+3
| |
| * drop traditional czech plural rules in favor of today's slovak-like rulesOswald Buddenhagen2009-06-031-8/+2
| |
| * fix turkish plural formsOswald Buddenhagen2009-06-031-1/+1
| |
| * fix tagalog plural formsOswald Buddenhagen2009-06-031-2/+8
| |
| * fix icelandic plural formsOswald Buddenhagen2009-06-031-1/+5
| |
| * fix lithuanian plural rulesOswald Buddenhagen2009-06-031-2/+2
| |
| * Fix parsing method calls with null arguments in Java codeEskil Abrahamsen Blomfeldt2009-05-201-5/+11
| | | | | | | | | | | | | | | | | | | | | | In Java, "null" is represented as a keyword, not as the integer 0. The old code assumed the latter. Code such as translate("fooBar", "fooBar", null); would thus not be detected by lupdate when parsing Java files. Reviewed-by: ossi
* | improved string operations all over the placeThierry Bastian2009-05-282-3/+3
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | implement --locations option (complementing lupdate)Oswald Buddenhagen2009-05-251-1/+1
| |
* | implement --no-ui-lines option (complementing lupdate)Oswald Buddenhagen2009-05-252-0/+21
| |
* | make quote/escape parsing more qmake-compatibleOswald Buddenhagen2009-04-291-50/+67
| |
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-151-1/+10
|\ \ | |/
| * protect against circular inclusion of pro/pri filesOswald Buddenhagen2009-04-151-1/+7
| | | | | | | | Task-number: 250574
| * do not crash on lines starting with an equal signOswald Buddenhagen2009-04-151-0/+3
| |
| * fix uninitialized variable readOswald Buddenhagen2009-04-151-4/+12
| |
| * add some commentsOswald Buddenhagen2009-04-151-4/+4
| |
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-151-2/+2
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * compile with aCCOswald Buddenhagen2009-04-071-2/+2
| |
* | amend 3570e978058816745101a69b552ad9d07e349542 for masterOswald Buddenhagen2009-04-021-5/+6
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-026-33/+77
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * re-initialize some variables for each fileOswald Buddenhagen2009-04-021-5/+4
| |
| * fix evaluation of CONFIG() and contains()Oswald Buddenhagen2009-04-021-3/+4
| | | | | | | | cherry-picked from creator's b3ec859c80bd0656cfc48cfe6514ec4f631b8206
| * fix wrong evaluation of arguments to qmake functionsOswald Buddenhagen2009-04-021-1/+2
| | | | | | | | cherry-pick 28dacdfdf3eed04ec47a1e8eb206bd3ffb979c08 from creator
| * duplicate message handling improvementsOswald Buddenhagen2009-04-025-50/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * optimize duplicate resolutionOswald Buddenhagen2009-04-021-5/+26
| | | | | | | | use pointers in the index hash to avoid needless allocs and copies
* | Merge branch '4.5'Thiago Macieira2009-03-279-242/+359
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * properly process backslash line continuationsOswald Buddenhagen2009-03-271-6/+13
| | | | | | | | | | | | this is a backport of be5a9587865f9f042cac8feb5296b71b11a1a80f Task-number: 249633
| * static is even better than constOswald Buddenhagen2009-03-271-4/+4
| |
| * declare type info next to the type, not "somewhere"Oswald Buddenhagen2009-03-272-2/+2
| |
| * properly deal with messages which appear in multiple encodingsOswald Buddenhagen2009-03-276-220/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * micro-optimization: don't evaluate same condition twiceOswald Buddenhagen2009-03-271-2/+2
| |
| * actually ignore untranslated messages as it claimsOswald Buddenhagen2009-03-271-2/+4
| |
| * avoid empty codec nameOswald Buddenhagen2009-03-272-2/+4
| |
| * beautify / micro-optimizeOswald Buddenhagen2009-03-271-3/+4
| |
| * proper encoding and escapingOswald Buddenhagen2009-03-271-4/+37
| |