summaryrefslogtreecommitdiffstats
path: root/translations
Commit message (Collapse)AuthorAgeFilesLines
* Remove remaining instances of THISYEAR placeholder.Jason McDonald2009-09-222-3/+3
| | | | Reviewed-by: Trust Me
* Fix typo introduced in previous submit.Jason McDonald2009-08-181-1/+2
| | | | Reviewed-by: Trust Me
* Update URL's to use new domain.Jason McDonald2009-08-1237-129/+128
| | | | Reviewed-by: Trust Me
* Updated and purged German translation of Qt Designer.Friedemann Kleint2009-08-111-317/+336
|
* Translations: Purged and updated German of Assistant/Linguist/Help.Friedemann Kleint2009-08-103-1204/+300
|
* typos in German translationFrederik Schwarzer2009-07-161-7/+7
| | | | Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge commit 'origin/4.5'Bill King2009-07-087-220/+1647
|\ | | | | | | | | | | | | | | | | | | 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
| * Update Russian translation for Qt Assistant adpRitt Konstantin2009-07-061-46/+243
| | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translation for Qt AssistantRitt Konstantin2009-07-061-43/+37
| | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translation for Qt HelpRitt Konstantin2009-07-061-18/+18
| | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Add basic Russian translation for qtconfigRitt Konstantin2009-07-061-0/+906
| | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Add Russian translation for qvfbRitt Konstantin2009-07-061-0/+328
| | | | | | | | | | Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translation for Qt Linguist.Ritt Konstantin2009-07-061-11/+17
| | | | | | | | | | | | | | | | | | typo fixes; clarify several strings; use 'own languages' hack Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translation for Qt libraries.Ritt Konstantin2009-07-061-108/+104
| | | | | | | | | | | | | | almost done; only few strings left untranslated. Merge-request: 803 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | update German translationFrederik Schwarzer2009-07-062-144/+150
| | | | | | | | | | | | | | | | - unification - typos Merge-request: 823 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-186-53/+4241
|\ \ | |/ | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| * Add Russian translation for Qt Assistant.Ritt Konstantin2009-06-172-0/+1843
| | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Add Russian translation for QtHelp.Ritt Konstantin2009-06-171-0/+361
| | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Add Russian translation for Qt Linguist.Ritt Konstantin2009-06-171-0/+2002
| | | | | | | | | | Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translation for Qt libraries.Ritt Konstantin2009-06-171-1751/+1677
| | | | | | | | | | | | | | | | Added QtWebkit and QXmlPatterns translations. This is an almost complete translation. Merge-request: 689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * revert built-time qm generationOswald Buddenhagen2009-06-162-53/+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 license header changes from 4.5Volker Hilsheimer2009-06-162-3/+12
|\ \ | |/
| * Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-161-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * make qm target work when the freshly built Qt is not in the libraryOswald Buddenhagen2009-06-151-2/+11
| | | | | | | | | | | | | | | | | | search path unlike moc and uic, lrelease is not statically built, so when building without RPATH, we need to ensure that our libraries are found first. Reviewed-by: mariusSO
* | German translation updateFrederik Schwarzer2009-06-156-139/+139
| | | | | | | | | | | | | | | | | | | | - avoid exclamation mark - prefer passive forms ("Tue dies" -> "Dies tun") - unification in wording (Katalogdatei, "QT" -> "Qt", "wollen" -> "möchten") - typos (missing dahes, casing, ...) Merge-request: 680 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-1245-35/+44
|\ \ | |/ | | | | | | | | | | | | | | | | 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-1145-35/+44
| | | | | | | | | | | | | | | | | | 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-274-1/+9299
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * Integrate merge-request #549 into branch '4.5'Simon Hausmann2009-05-274-1/+9299
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Thomas Sondergaard (2): Danish translations Updated danish translations. Added them to relevant project files. Request-url: http://qt.gitorious.org/qt/qt/merge_requests/549 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * Updated danish translations. Added them to relevant project files.Thomas Sondergaard2009-05-264-635/+2128
| | |
| | * Danish translationsThomas Sondergaard2009-05-203-0/+7805
| | |
| * | Update japanese translation of Qt Assistant 4.5axasia2009-05-251-192/+203
| | |
* | | Integrate merge-request #504 into branch 'master'Simon Hausmann2009-05-271-81/+81
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frederik Schwarzer (4): wording: Warnung -> Achtung wording: Voransicht -> Vorschau wrong translation of the Chinese writing systems quite a bunch of fixes and suggenstions Request-url: http://qt.gitorious.org/qt/qt/merge_requests/504 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | | quite a bunch of fixes and suggenstionsFrederik Schwarzer2009-05-221-72/+72
| | | | | | | | | | | | | | | | | | | | If it comes to unification in wording style, there is a long road ahead...
| * | | wrong translation of the Chinese writing systemsFrederik Schwarzer2009-05-221-2/+2
| | | | | | | | | | | | | | | | | | | | The translations for Traditional and Simplified Chinese are Chinesisch (Langzeichen) and Chinesisch (Kurzzeichen)
| * | | wording: Voransicht -> VorschauFrederik Schwarzer2009-05-221-2/+2
| | | |
| * | | wording: Warnung -> AchtungFrederik Schwarzer2009-05-221-5/+5
| | | |
* | | | Integrate merge-request #525 into branch 'master'Simon Hausmann2009-05-272-1519/+1515
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ritt Konstantin (1): Update Russian translation for Qt libraries (xmlpatterns and statemachine are not translated yet) Request-url: http://qt.gitorious.org/qt/qt/merge_requests/525 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | | | Update Russian translation for Qt libraries (xmlpatterns and statemachine ↵Ritt Konstantin2009-05-242-1519/+1515
| |/ / / | | | | | | | | | | | | are not translated yet)
* | | | Update japanese translation of Qt Linguist.axasia2009-05-242-229/+237
|/ / /
* | | 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