summaryrefslogtreecommitdiffstats
path: root/translations/translations.pri
Commit message (Collapse)AuthorAgeFilesLines
* add check-ts target to auto-asses translation completenessOswald Buddenhagen2010-06-071-1/+4
|
* qt_ja_JP.ts => qt_ja.tsOswald Buddenhagen2010-06-071-1/+1
| | | | | the other _ja files have no country qualification either, and it makes no sense anyway.
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-5/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| * define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-141-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the function provides a cross-platform way to determine the exact pathname of our build tools (moc, etc.). use it in our .prf files, so we don't have to rely on qmake's unreliable path separator normalization magic in extra compiler commands, which broke on mingw+sh in silent mode. remove the bootstrap tool path setting from configure, as it is redundant now. Reviewed-by: joerg Task-number: QTBUG-10633
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-041-1/+1
|\ \ | |/ | | | | | | Conflicts: translations/translations.pri
| * rename qt_iw.ts to qt_he.tsOswald Buddenhagen2010-05-031-1/+1
| | | | | | | | | | iw comes from the obsolete ISO639. we are using ISO639-1 or something newer.
* | fix ts-assistant targetOswald Buddenhagen2010-02-251-1/+1
| |
* | Prepare translations of the declarative module.Friedemann Kleint2010-02-151-0/+1
| | | | | | | | | | Add to translations profile. move stuff out of QObject-context, correct spelling and contractions, correct usage of tr().
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * Added Czech translations.Pavel Fric2010-02-021-1/+1
| | | | | | | | | | Merge-request: 440 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Add Qt base hungarian translationLaszlo Papp2010-02-031-1/+1
| | | | | | | | | | | | Signed-off-by: Laszlo Papp <djszapi@archlinux.us> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Merge branch '4.6'Thiago Macieira2010-01-211-2/+6
|\ \ | |/ | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * another attempt at fixing the translations buildOswald Buddenhagen2010-01-191-2/+6
| | | | | | | | make qmake generate proper dependencies on lrelease in vcproj/sln files
* | Merge branch '4.6'Thiago Macieira2009-12-021-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf 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
| * another shot at fixing directory separators in build commandsOswald Buddenhagen2009-11-251-1/+1
| |
* | Merge branch '4.6'Thiago Macieira2009-11-251-29/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * fix mingw build when sh is in $PATHOswald Buddenhagen2009-11-161-1/+1
| |
| * make qm file creation a regular build stepOswald Buddenhagen2009-11-101-32/+3
| | | | | | | | | | | | | | | | | | this is mostly a revert of the revert of the previous attempt, only that this time we have a bootstrapped lrelease which won't blow up for cross-compilations. Reviewed-By: Jason McDonald Task-Id: QTBUG-4939
* | Merge branch '4.6'Thiago Macieira2009-10-081-4/+1
|\ \ | |/ | | | | | | Conflicts: tools/assistant/translations/translations_adp.pro
| * Merge branch '4.5' into 4.6Thiago Macieira2009-10-081-4/+1
| |\ | | | | | | | | | | | | Conflicts: src/gui/itemviews/qheaderview.cpp
| | * fix ts and qm targets under windowsOswald Buddenhagen2009-10-071-4/+1
| | |
* | | Merge branch '4.6'Thiago Macieira2009-10-051-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdatastream.h tools/assistant/translations/translations_adp.pro tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-inc.qdocconf tools/qdoc3/test/qt.qdocconf translations/assistant_adp_de.ts
| * | fix ts and qm targets for shadow builds and builds with -prefixOswald Buddenhagen2009-10-011-2/+2
| | |
| * | remove *_untranslated.tsOswald Buddenhagen2009-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | with the current scheme of running "make ts" only when doing a particular translation and checking in only the relevant file, these files are never updated. lconvert can generate an empty template from any translation anyway.
* | | Merge branch '4.6'Thiago Macieira2009-09-301-1/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/corelib/io/qdatastream.h
| * | Add Slovenian translationJure Repinc2009-09-291-1/+1
| | | | | | | | | | | | | | | Merge-request: 1320 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge branch '4.6'Thiago Macieira2009-09-291-0/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: doc/src/qt4-intro.qdoc
| * | I18N: Add new module, fix spelling glitch.Friedemann Kleint2009-09-291-0/+2
| | |
* | | Stop building the depricated Assistant translation, soon the be removed.kh12009-08-311-7/+2
|/ /
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-3/+35
|\ \ | |/ | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| * revert built-time qm generationOswald Buddenhagen2009-06-161-3/+35
| | | | | | | | | | | | | | | | | | | | | | it simply breaks too much (embedded builds in particular). will come up with something better in master. note however, that the .qm files do NOT return to the repository. the release manager needs to run "make qm" before packaging, just like Qt-from-git users who want translations do (i.e., almost nobody). Reviewed-by: Jason McDonald
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-35/+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
| * turn qm generation into a build time targetOswald Buddenhagen2009-06-111-35/+3
| | | | | | | | | | | | | | | | | | consequently, remove the qm files from the repository this uses some really black magic to convince qmake to do the right thing. this will be fixed properly in a later version. Reviewed-by: mariusSO
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-1/+1
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * Updated danish translations. Added them to relevant project files.Thomas Sondergaard2009-05-261-1/+1
| |
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+107
|
* Long live Qt!Lars Knoll2009-03-231-0/+108
generated by cgit v0.12 at 2024-12-07 17:04:43 (GMT)