summaryrefslogtreecommitdiffstats
path: root/tools/linguist
Commit message (Collapse)AuthorAgeFilesLines
* fix detection of relative location informationOswald Buddenhagen2011-04-111-5/+7
| | | | | | | | | an empty line number does not indicate relative loc info - it may be the result of -no-ui-lines. instead, an empty file name does indicate it - no file name at all makes no sense, so this means a previous messages has set it already. and we need this additional detection, as the entire ts file may have no line number info to base the decision on at all.
* make -markuntranslated work without -idbasedOswald Buddenhagen2011-04-081-1/+1
| | | | Task-number: QTBUG-18625
* sort out stdout vs. stderr usageOswald Buddenhagen2011-03-222-34/+39
| | | | Task-number: QTBUG-14728
* Don't ignore source-text when generating qsTrId translations for QMLTor Arne Vestbø2011-02-011-1/+1
| | | | Reviewed-by: ossi
* fix typo in error messagesOswald Buddenhagen2011-01-172-2/+2
| | | | Task-number: QTBUG-16369
* Update copyright year to 2011.Jason McDonald2011-01-1084-85/+85
| | | | Reviewed-by: Trust Me
* refuse to open empty translation filesOswald Buddenhagen2010-12-101-0/+7
| | | | | | | | | | they cause a crash. fixing it properly would be in no reasonable relation to the gain (none whatsoever), so just forbid it. yes, this breaks the message freeze ... big deal in a translation application. ;) Task-number: QTBUG-14574
* Resolve EPOCROOT in qt.conf using same logic as in .proMiikka Heikkinen2010-11-181-0/+1
| | | | | | | | | | Previously it was only possible to use EPOCROOT in qt.conf via env variable, while qmake & configure could resolve it also via devices.xml. Changed qt.conf parsing to support $${EPOCROOT} tag and use same resolving logic as qmake & configure. Task-number: QTBUG-15393 Reviewed-by: axis
* Localize .loc and .pkg content based on TRANSLATIONSMiikka Heikkinen2010-11-121-0/+4
| | | | | | | | | | | | | | | | | | | If developer specifies "CONFIG += localize_deployment" in .pro file, the generated .loc and .pkg will now use translatable strings from .ts files defined in TRANSLATIONS. The .ts files must have an underscore and Qt language code at the end of the filename body to be compatible with deployment localization. E.g. myapp_en.ts. Running lupdate will generate these entries into .ts files: - Application short caption - Application long caption - Package name - Smart installer package name Task-number: QTBUG-13917 Reviewed-by: Oswald Buddenhagen Reviewed-by: Janne Anttila Reviewed-by: axis
* Doc: Fixing typoSergio Ahumada2010-11-092-3/+3
|
* make the dtd reflect realityOswald Buddenhagen2010-11-021-18/+5
|
* Don't use translations for console tools under windowsVictor Ostashevsky2010-09-283-1/+7
| | | | | | | Task-number: QTBUG-13619 Merge-request: 2486 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-141-2/+2
|
* fetch next token after class definition openingOswald Buddenhagen2010-09-101-0/+2
| | | | | | this makes no real difference, as at this point the token is known to be an opening brace which will be handled without side effects in the next iteration, but this is a tad more efficient and simply cleaner.
* delay next token fetching when opening namespaceOswald Buddenhagen2010-09-101-1/+1
| | | | | | | | otherwise, if the next token to be fetched is a non-empty #define, it would save the context before entering the namespace, and thus the post-define context restore would just discard the namespace entry. Task-number: QTBUG-12683
* don't let operator overloads confuse usOswald Buddenhagen2010-09-101-0/+15
| | | | Task-number: QTBUG-11426
* don't try to show source when no locations are givenOswald Buddenhagen2010-09-102-4/+4
| | | | Task-number: QTBUG-13466
* search translator commentsOswald Buddenhagen2010-09-061-0/+2
| | | | Task-number: QTBUG-4165
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-011-1/+158
|\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: The declarative parser should only save comment text (and not /*,*/,//) Support for qsTrId and meta-data in comments for QML. Flickable ensure internal pressed state is cleared when mouse is released. Fix examples autotest Support JS "in" operator on QML objects Only emit change signal when variant properties actually change Use QApplication in QDeclarativeEngine example.
| * The declarative parser should only save comment text (and not /*,*/,//)Michael Brasser2010-09-011-3/+1
| | | | | | | | Reviewed-by: Roberto Raggi
| * Support for qsTrId and meta-data in comments for QML.Michael Brasser2010-09-011-1/+160
| |
* | Wrap translatable messages with tr() in assistant, designer and linguistVictor Ostashevsky2010-09-0111-146/+192
| | | | | | | | | | Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Enable loading/generating translations by assistant and linguist toolsVictor Ostashevsky2010-09-013-2/+31
|/ | | | | | | | | | QTranslator is installed in tools (qcollectiongenerator, qhelpconverter, qhelpgenerator, lconvert, lrelease, lupdate). Build targets that updates .ts files are changed to include strings from this tools. Merge-request: 2456 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* preserve non-standard source referencesOswald Buddenhagen2010-08-301-4/+20
| | | | | | | | | the PO format doc suggests that all references are in filename:linennumber format, but some tools seem to deviate from that. so do our best to preserve such references, even if we can't do anything with them. Task-number: QTBUG-9488
* properly parse ts contexts in obsolete messagesOswald Buddenhagen2010-08-301-0/+2
|
* move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handlerOswald Buddenhagen2010-08-302-8/+15
| | | | | after all, it is pretty much specific to xlf files, even if the problem majorly concerns converted po files.
* Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP()Kent Hansen2010-08-232-0/+40
| | | | | | | | | Extracting the translation data is only the first step; a separate commit will make the functions available in the QtScript runtime. Task-number: QTBUG-8454 Reviewed-by: Oswald Buddenhagen
* Add support for comments and meta-data in the lupdate QtScript frontendKent Hansen2010-08-232-22/+311
| | | | | | | | | | | | | | | | This brings the support more in line with the C++ frontend. No support for magic TRANSLATOR comment yet. Add a proper test for the QtScript parser. Support for qtTrId() and friends coming in a separate commit. Previously the lexer just skipped comments. Now the contents of each comment is retained and passed to a "comment processor" interface. The parser implements the interface and performs logic very similar to the C++ parser to extract data from the comment. Task-number: QTBUG-11774 Reviewed-by: Oswald Buddenhagen
* Streamline lupdate's QtScript frontend's error messagingKent Hansen2010-08-232-44/+78
| | | | | | | | | | | Like the C++ parser, use a yyMsg() function. Make the lexer a member of the parser, so yyMsg() can access the filename and current line number. This refactoring is done in preparation of two changes that introduce quite a few more potential error message calls (comment processing and qtTrId support). Reviewed-by: Oswald Buddenhagen
* add full width characters to ending() in linguistTasuku Suzuki2010-08-201-0/+3
| | | | | | | | U+FF01 (FULLWIDTH EXCLAMATION MARK), U+FF1F (FULLWIDTH QUESTION MARK) and U+FF1A (FULLWIDTH COLON) Merge-request: 2455 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* update Russian translations for Qt and toolsRitt Konstantin2010-08-111-2/+14
| | | | | Merge-request: 2445 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Translation work for 4.7Pierre Rossi2010-08-061-0/+40
| | | | | | | | validating and adding some french translations. Plus all the fixes from Gabriel's extensive review. Doc: Fix a typo Reviewed-by: gabi
* Some french translationsPierre Rossi2010-08-061-5/+17
| | | | Reviewed-by: gabi
* Fix the remote command delimiter, this has cahnged at some point.kh12010-08-041-1/+1
| | | | | Task-number: QTBUG-12485 QTBUG-12651 Reviewed-by: ck
* more fine-grained ts targetsOswald Buddenhagen2010-07-151-12/+0
| | | | | | | | | there are now per-language ts-<package>-<lang> and ts-<lang> targets to update only the files relevant for a given language. there is also a ts-all target which does what the old ts target did. the ts-<package> targets are now named ts-<package>-all and should not be used manually - they exist for the convenience of the ts-all target. the ts target is now only a help blurb.
* immediately set function context when entering a namespaceOswald Buddenhagen2010-07-071-1/+6
| | | | | | | | otherwise, tr() calls without absolute qualification will not be properly qualified inside the first function if it has no qualification, either. Task-number: QTBUG-11742 (not really)
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-291-26/+58
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits) update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes ...
| * Make compile.Michael Brasser2010-06-241-1/+1
| |
| * Update lupdate to recognize concatenated text in QML files.Michael Brasser2010-06-241-16/+56
| | | | | | | | | | | | Also fixes a potential crash with non-string-literal nodes. Task-number: QTBUG-11580
| * Support for non-literal plural arguments to qsTr() in lupdate (QML).Michael Brasser2010-06-231-12/+4
| | | | | | | | Task-number: QTBUG-11579
* | warn about stray meta dataOswald Buddenhagen2010-06-291-4/+7
| |
* | don't complain multiple times about same abuse of //% meta stringsOswald Buddenhagen2010-06-291-0/+3
| | | | | | | | | | Reviewed-by: Kent Hansen Task-number: QTBUG-11818
* | fix double percent sign after migration to yyMsg()Oswald Buddenhagen2010-06-291-2/+2
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-091-1/+1
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fixed compilation for solaris based compilers, macro doesn't require trailing semicolon.
| * Fixed compilation for solaris based compilers, macro doesn't require ↵Toby Tomkins2010-06-091-1/+1
| | | | | | | | | | | | trailing semicolon. Reviewed-by: Rohan McGovern
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-082-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/painting/qpainter.cpp src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qfontmetrics/tst_qfontmetrics.cpp tools/linguist/lupdate/main.cpp
| * fix translations from some header files being omittedOswald Buddenhagen2010-06-071-0/+1
| | | | | | | | | | | | | | | | | | add the containing directories of all files specified on the command line to the list of project roots. otherwise, the strings from headers which are included before being encountered on the command line will be omitted. Task-number: QTBUG-10345
| * propagate code change back to .g sourceOswald Buddenhagen2010-06-031-1/+1
| | | | | | | | missed that in 60acaf5e
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-041-0/+752
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Synchronizing to latest tree Adding correct hungarian translation Search local directory if no qconfig file found in src/corelib/global/ Fix QT_NO_CLIPBOARD Fix QT_NO_ACTION
| * | Synchronizing to latest treeGarami Gábor2010-06-041-0/+8
| | | | | | | | | | | | | | | Merge-request: 659 Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>