Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/4.5' | Oswald Buddenhagen | 2009-06-23 | 1 | -3/+20 |
|\ | | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp | ||||
| * | mark plural messages as such in the qm reader | Oswald Buddenhagen | 2009-06-23 | 1 | -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 reader | Oswald Buddenhagen | 2009-06-23 | 1 | -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.5 | Volker Hilsheimer | 2009-06-16 | 18 | -42/+37 |
|\ \ | |/ | |||||
| * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 25 | -50/+50 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | no point in ProFile being a QObject | Oswald Buddenhagen | 2009-06-15 | 1 | -4/+1 |
| | | |||||
| * | remove unused includes | Oswald Buddenhagen | 2009-06-15 | 2 | -2/+0 |
| | | |||||
* | | purge dead code | Oswald Buddenhagen | 2009-06-15 | 1 | -18/+4 |
| | | |||||
* | | Merge commit 'origin/4.5' | Bjørn Erik Nilsen | 2009-06-12 | 1 | -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 plurals | Oswald Buddenhagen | 2009-06-11 | 1 | -2/+2 |
| | | |||||
| * | add plural rules for urdu | Oswald Buddenhagen | 2009-06-11 | 1 | -0/+1 |
| | | |||||
| * | don't let comments weaved into strings confuse us | Oswald Buddenhagen | 2009-06-10 | 1 | -1/+3 |
| | | | | | | | | | | | | Reviewed-by: TrustMe Task-number: 254260 Testcase: 323072@p4 | ||||
| * | explicitly handle windows and mac9 line endings | Oswald Buddenhagen | 2009-06-05 | 1 | -5/+20 |
| | | | | | | | | | | | | in practice, this matters only for backslashed line continuations Task-number: 255336 | ||||
* | | Merge commit 'origin/4.5' | Olivier Goffart | 2009-06-04 | 1 | -19/+27 |
|\ \ | |/ | |||||
| * | fix catalan plural rules | Oswald Buddenhagen | 2009-06-03 | 1 | -2/+7 |
| | | |||||
| * | rename some plural forms | Oswald Buddenhagen | 2009-06-03 | 1 | -4/+3 |
| | | |||||
| * | drop traditional czech plural rules in favor of today's slovak-like rules | Oswald Buddenhagen | 2009-06-03 | 1 | -8/+2 |
| | | |||||
| * | fix turkish plural forms | Oswald Buddenhagen | 2009-06-03 | 1 | -1/+1 |
| | | |||||
| * | fix tagalog plural forms | Oswald Buddenhagen | 2009-06-03 | 1 | -2/+8 |
| | | |||||
| * | fix icelandic plural forms | Oswald Buddenhagen | 2009-06-03 | 1 | -1/+5 |
| | | |||||
| * | fix lithuanian plural rules | Oswald Buddenhagen | 2009-06-03 | 1 | -2/+2 |
| | | |||||
| * | Fix parsing method calls with null arguments in Java code | Eskil Abrahamsen Blomfeldt | 2009-05-20 | 1 | -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 place | Thierry Bastian | 2009-05-28 | 2 | -3/+3 |
| | | | | | | | | | | used character operations whenever possible better usage of QLatin1String | ||||
* | | implement --locations option (complementing lupdate) | Oswald Buddenhagen | 2009-05-25 | 1 | -1/+1 |
| | | |||||
* | | implement --no-ui-lines option (complementing lupdate) | Oswald Buddenhagen | 2009-05-25 | 2 | -0/+21 |
| | | |||||
* | | make quote/escape parsing more qmake-compatible | Oswald Buddenhagen | 2009-04-29 | 1 | -50/+67 |
| | | |||||
* | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qt | Simon Hausmann | 2009-04-15 | 1 | -1/+10 |
|\ \ | |/ | |||||
| * | protect against circular inclusion of pro/pri files | Oswald Buddenhagen | 2009-04-15 | 1 | -1/+7 |
| | | | | | | | | Task-number: 250574 | ||||
| * | do not crash on lines starting with an equal sign | Oswald Buddenhagen | 2009-04-15 | 1 | -0/+3 |
| | | |||||
| * | fix uninitialized variable read | Oswald Buddenhagen | 2009-04-15 | 1 | -4/+12 |
| | | |||||
| * | add some comments | Oswald Buddenhagen | 2009-04-15 | 1 | -4/+4 |
| | | |||||
* | | Merge commit 'origin/4.5' | Olivier Goffart | 2009-04-15 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| * | compile with aCC | Oswald Buddenhagen | 2009-04-07 | 1 | -2/+2 |
| | | |||||
* | | amend 3570e978058816745101a69b552ad9d07e349542 for master | Oswald Buddenhagen | 2009-04-02 | 1 | -5/+6 |
| | | |||||
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-02 | 6 | -33/+77 |
|\ \ | |/ | | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp | ||||
| * | re-initialize some variables for each file | Oswald Buddenhagen | 2009-04-02 | 1 | -5/+4 |
| | | |||||
| * | fix evaluation of CONFIG() and contains() | Oswald Buddenhagen | 2009-04-02 | 1 | -3/+4 |
| | | | | | | | | cherry-picked from creator's b3ec859c80bd0656cfc48cfe6514ec4f631b8206 | ||||
| * | fix wrong evaluation of arguments to qmake functions | Oswald Buddenhagen | 2009-04-02 | 1 | -1/+2 |
| | | | | | | | | cherry-pick 28dacdfdf3eed04ec47a1e8eb206bd3ffb979c08 from creator | ||||
| * | duplicate message handling improvements | Oswald Buddenhagen | 2009-04-02 | 5 | -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 resolution | Oswald Buddenhagen | 2009-04-02 | 1 | -5/+26 |
| | | | | | | | | use pointers in the index hash to avoid needless allocs and copies | ||||
* | | Merge branch '4.5' | Thiago Macieira | 2009-03-27 | 9 | -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 continuations | Oswald Buddenhagen | 2009-03-27 | 1 | -6/+13 |
| | | | | | | | | | | | | this is a backport of be5a9587865f9f042cac8feb5296b71b11a1a80f Task-number: 249633 | ||||
| * | static is even better than const | Oswald Buddenhagen | 2009-03-27 | 1 | -4/+4 |
| | | |||||
| * | declare type info next to the type, not "somewhere" | Oswald Buddenhagen | 2009-03-27 | 2 | -2/+2 |
| | | |||||
| * | properly deal with messages which appear in multiple encodings | Oswald Buddenhagen | 2009-03-27 | 6 | -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 twice | Oswald Buddenhagen | 2009-03-27 | 1 | -2/+2 |
| | | |||||
| * | actually ignore untranslated messages as it claims | Oswald Buddenhagen | 2009-03-27 | 1 | -2/+4 |
| | | |||||
| * | avoid empty codec name | Oswald Buddenhagen | 2009-03-27 | 2 | -2/+4 |
| | | |||||
| * | beautify / micro-optimize | Oswald Buddenhagen | 2009-03-27 | 1 | -3/+4 |
| | | |||||
| * | proper encoding and escaping | Oswald Buddenhagen | 2009-03-27 | 1 | -4/+37 |
| | |