summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/4.5'Oswald Buddenhagen2009-07-131-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp src/3rdparty/webkit/WebCore/generated/CSSGrammar.h src/3rdparty/webkit/WebCore/generated/Grammar.cpp src/3rdparty/webkit/WebCore/generated/Grammar.h src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp src/3rdparty/webkit/WebCore/generated/XPathGrammar.h src/3rdparty/webkit/WebKit/qt/ChangeLog tools/linguist/lrelease/main.cpp tools/linguist/lupdate/main.cpp tools/linguist/shared/profileevaluator.cpp
| * implement proper vpath handlingOswald Buddenhagen2009-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | this also removes the bogus special casing of various filename-containing variables inside the pro parser. while this is a feature as such, it restores backwards compatibility without damaging the correct behavior again, so it qualifies for 4.5. based on a2f40fce2a1cf3c19a13fa27eea08192493ab76e from creator Task-number: 254098
| * factor out linguist-specific partOswald Buddenhagen2009-07-131-0/+1
| | | | | | | | it is simpler to keep it in sync with creator then.
* | Merge commit 'origin/4.5'Bill King2009-07-081-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
| * don't drop all location tags after the first file without anyOswald Buddenhagen2009-07-081-2/+3
| | | | | | | | Task-number: 256647
* | general wording change for some file type namesFrederik Schwarzer2009-07-062-10/+10
| | | | | | | | | | | | | | | | | | | | | | - .ts file -> TS file - .qm file -> QM file - .ui file -> UI file + a handfull of typos I stumbled over Merge-request: 802 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | support for id-based translationsOswald Buddenhagen2009-07-061-1/+69
| | | | | | | | | | | | | | | | | | | | | | unlike in an earlier attempt, ids are textual this time. the developer is able to provide a template for the string. when lupdate and lrelease are integrated into the build process, this makes it possible to avoid a round-trip to a dedicated string designer during the early development stage. Requirement-id: QT-435
* | remove arbitrary string length limitsOswald Buddenhagen2009-07-061-11/+2
| |
* | add support for attaching meta data to translatable messagesOswald Buddenhagen2009-07-021-5/+30
| | | | | | | | Requirement: QT-457
* | const ref for foreach()Oswald Buddenhagen2009-06-301-1/+1
| |
* | Update license headers in files that are new in 4.6.Jason McDonald2009-06-171-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Merge license header changes from 4.5Volker Hilsheimer2009-06-168-24/+45
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-162-12/+33
| | | | | | | | Reviewed-by: Trust Me
* | don't let comments weaved into strings confuse usOswald Buddenhagen2009-06-151-1/+3
| | | | | | | | | | | | | | Task-number: 254260 cherry-picked 941a03814a5f8f7be93425f71ee65a4222d16899 after botched merge from 4.5
* | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-081-5/+20
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
* | Fixed build issue with Sun CC 5.5.jasplin2009-06-051-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | improved string operations all over the placeThierry Bastian2009-05-281-3/+3
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | remove now unused static functionOswald Buddenhagen2009-05-251-11/+2
| | | | | | | | sneak in white space change :)
* | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-201-5/+11
|\ \ | |/
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-151-8/+16
|\ \ | |/
* | 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-021-0/+1
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * duplicate message handling improvementsOswald Buddenhagen2009-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | Merge branch '4.5'Thiago Macieira2009-03-272-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * whitespaceOswald Buddenhagen2009-03-271-1/+1
| |
| * Long live Qt 4.5!Lars Knoll2009-03-235-0/+697
|
* better help outputOswald Buddenhagen2009-03-241-5/+5
| | | | | | - 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-2312-0/+8403