summaryrefslogtreecommitdiffstats
path: root/tools/linguist
Commit message (Collapse)AuthorAgeFilesLines
* make quote/escape parsing more qmake-compatibleOswald Buddenhagen2009-04-291-50/+67
|
* Merge branch '4.5'Rhys Weatherley2009-04-211-1/+0
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * BT: Remove turkish translation files created by previous change.Jason McDonald2009-04-211-1/+0
| | | | | | | | | | | | | | | | Remove the *_tr_TR.ts files added in change 5e3cae2754bf5f50aa10fef2c8d3bb7d33407b96 and remove their entries from .pro files to prevent them coming back next time someone does "make ts". Reviewed-by: Trust Me
* | Merge branch '4.5'Thiago Macieira2009-04-201-7/+0
|\ \ | |/ | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * mac: remove special handling of the editor frame now that stylesheets work ↵Oswald Buddenhagen2009-04-201-7/+0
| | | | | | | | properly
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-201-22/+2
|\ \ | |/ | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h
| * Fix the About Qt dialog text to be truthful, post-LGPLJason McDonald2009-04-181-22/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the text of the About Qt dialog, as directed by Legal. Note that this change breaks string freeze as the text is translatable, however Legal has decided that shipping legally correct text has priority over shipping complete translations. This change includes updated .ts files to correct the source strings, but no updated translations. This change also removes out-of-date licensing text from the About dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer. Those particular changes should not break translations as they only remove translatable strings and do not modify any others. Task-number: 247608 Reviewed-by: Trust Me .....review will be conducted after submission.
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-152-9/+26
|\ \ | |/
| * 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
| |
* | don't lose codecForTr in c++ parserOswald Buddenhagen2009-04-021-1/+3
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-0210-51/+87
|\ \ | |/ | | | | | | 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-029-68/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | fix 223949: Qt's translation should be installed only if Linguistshjk2009-04-021-5/+8
| | | | | | | | translation is found
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-014-3/+5
|\ \ | |/ | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| * normalize file namesOswald Buddenhagen2009-04-012-2/+2
| | | | | | | | | | | | makes tool tips less ugly Task-number: 246114
| * do not crash upon dnd-ing text into non-focused lineeditOswald Buddenhagen2009-04-011-0/+2
| | | | | | | | Task-number: 249519
| * one more bogus trolltech => qtsoftware renameOswald Buddenhagen2009-04-011-1/+1
| |
* | Merge branch '4.5'Thiago Macieira2009-03-2716-255/+372
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| |
| * whitespaceOswald Buddenhagen2009-03-2716-27/+27
| |
| * Long live Qt 4.5!Lars Knoll2009-03-23179-0/+42194
|
* better help outputOswald Buddenhagen2009-03-242-16/+12
| | | | | | - lconvert: remove the duplicated format list now that source files are not listed as "formats" any more - wording improvements
* Long live Qt!Lars Knoll2009-03-23177-0/+43494
generated by cgit v0.12 at 2024-12-02 21:17:07 (GMT)