summaryrefslogtreecommitdiffstats
path: root/translations
Commit message (Collapse)AuthorAgeFilesLines
* Integrate merge-request #447 into branch 'master'Oswald Buddenhagen2009-05-191-1746/+1812
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | KOBAYASHI Tomoyuki (1): Update japanese translation file "translations/qt_ja_JP.ts". Repository: git://gitorious.org/~maron/qt/marons-clone.git Branch: master (6a94214e691966874faaab0bacd5d787850e0546) Request-url: http://qt.gitorious.org/qt/qt/merge_requests/447 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Merge commit '6a94214e691966874faaab0bacd5d787850e0546' into HEAD Merge commit '6a94214e691966874faaab0bacd5d787850e0546' into HEAD
| * Update japanese translation file "translations/qt_ja_JP.ts".KOBAYASHI Tomoyuki2009-05-191-1746/+1812
| | | | | | | | QtXmlPatterns is not completed.
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-1810-299/+300
|\ \ | |/ |/| | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * Updated German translations for 4.5.2Friedemann Kleint2009-05-1810-299/+300
| |
* | Update japanese translation of Qt Assistant.axasia2009-05-181-192/+203
| |
* | Merge branch '4.5'Rhys Weatherley2009-04-215-11286/+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-215-11286/+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-2015-125/+125
|\ \ | |/ | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * BT: Update text of About Qt dialogJason McDonald2009-04-2015-125/+125
| | | | | | | | | | | | Add Copyright message as requested by Legal, and update .ts files again. Reviewed-by: Trust Me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2059-7316/+22894
|\ \ | |/ | | | | | | Conflicts: src/gui/itemviews/qheaderview_p.h
| * Fix the About Qt dialog text to be truthful, post-LGPLJason McDonald2009-04-1859-7316/+22894
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Long live Qt 4.5!Lars Knoll2009-03-23100-0/+199400
|
* Long live Qt!Lars Knoll2009-03-23100-0/+199401