summaryrefslogtreecommitdiffstats
path: root/translations
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2010-01-212-4/+12
|\ | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * another attempt at fixing the translations buildOswald Buddenhagen2010-01-192-4/+12
| | | | | | | | make qmake generate proper dependencies on lrelease in vcproj/sln files
| * fix qm generation under windowsOswald Buddenhagen2010-01-141-1/+1
| | | | | | | | Reviewed-by: Daniel Molkentin
* | Merge branch '4.6'Thiago Macieira2010-01-1335-50/+78
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-1335-50/+50
| |\ | | | | | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testlupdate.cpp
| | * Update copyright year to 2010Jason McDonald2010-01-0635-50/+50
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Translations: Update German for 4.6.1Friedemann Kleint2010-01-081-0/+28
| |/
* | Merge branch '4.6'Thiago Macieira2009-12-266-398/+966
|\ \ | |/ | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * Update Polish translationsJarek Kobus2009-12-112-49/+49
| |
| * Update polish translationsJarek Kobus2009-12-106-349/+917
| |
* | Merge branch '4.6'Thiago Macieira2009-12-022-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-2/+2
| |
* | Merge branch '4.6'Thiago Macieira2009-11-2510-461/+8118
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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
| * French translation of designerBenjamin Poulain2009-11-181-0/+7046
| | | | | | | | Reviewed-by: Pierre Rossi
| * Updates the french translation of qt strings in qt_fr.tsPierre Rossi2009-11-181-114/+114
| | | | | | | | | | | | | | Also took care of placing non breakable spaces before double punctuation characters. Reviewed-by: Benjamin Poulain
| * Fixes duplicate accelerators in french translation of assistantYoann Lopes2009-11-181-42/+42
| | | | | | | | | | | | | | Also put non breakable spaces in front of characters such as ':', '!' and '?' Reviewed-by: Pierre Rossi
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-185-276/+871
| |\
| | * i18n: Complete and spell-check German translations for 4.6.0Friedemann Kleint2009-11-175-276/+871
| | |
| * | fix mingw build when sh is in $PATHOswald Buddenhagen2009-11-162-2/+2
| | |
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-132-221/+605
| |\ \ | | |/
| * | make qm file creation a regular build stepOswald Buddenhagen2009-11-102-32/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-11-132-288/+297
|\ \ \ | | |/ | |/|
| * | Update the translations of Qt AssistantBenjamin Poulain2009-11-111-221/+230
| | | | | | | | | | | | | | | | | | | | | Add the new translations for the string added by 500e71ab649a5053667ff3f9dc7d87730b565756 Update some translations
| * | Validate the translation of Qt_help by PierreBenjamin Poulain2009-11-111-67/+67
| | |
* | | Merge branch '4.6'Thiago Macieira2009-11-107-864/+2538
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qcommonstyle.cpp tools/assistant/lib/lib.pro tools/assistant/lib/qhelp_global.cpp tools/assistant/tools/assistant/assistant.qch tools/assistant/tools/assistant/mainwindow.cpp
| * | french translation of qt_helpPierre Rossi2009-11-101-0/+375
| |/
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-025-67/+1179
| |\
| | * Add a French translation to Assistant. Update the phrase book.Benjamin Poulain2009-10-301-0/+1080
| | | | | | | | | | | | Reviewed-by: Pierre Rossi
| | * Update Polish translationJarek Kobus2009-10-304-67/+99
| | |
| * | Updated Slovenian translation of Qt librariesJure Repinc2009-11-021-797/+984
| |/ | | | | | | | | Merge-request: 1977 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch '4.6'Thiago Macieira2009-10-211-317/+326
|\ \ | |/
| * i18n: Complete German translations for 4.6.0 (XmlPatterns)Friedemann Kleint2009-10-201-317/+326
| |
* | Merge branch '4.6'Thiago Macieira2009-10-1614-2916/+14104
|\ \ | |/ | | | | | | | | Conflicts: translations/assistant_adp_pl.ts translations/assistant_adp_ru.ts
| * Small fixes in Polish translationJarek Kobus2009-10-153-14/+14
| |
| * Update Polish translationsJarek Kobus2009-10-148-1730/+3657
| |
| * Add Russian translations for Qt DesignerRitt Konstantin2009-10-121-0/+7049
| | | | | | | | | | Merge-request: 1761 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translations for Qt Assistant, Qt Assistant Adp tools and Qt ↵Ritt Konstantin2009-10-123-93/+123
| | | | | | | | | | | | | | Help library Merge-request: 1761 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translations for Qt LinguistRitt Konstantin2009-10-121-175/+191
| | | | | | | | | | Merge-request: 1761 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translations for Qt Config and QtVfb toolsRitt Konstantin2009-10-122-53/+82
| | | | | | | | | | Merge-request: 1761 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Update Russian translations for Qt librariesRitt Konstantin2009-10-121-933/+3050
| | | | | | | | | | Merge-request: 1761 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | 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
| | |
| | * minor fixes in Russian translationsRitt Konstantin2009-09-292-19/+27
| | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Add Russian translation for Qt DesignerRitt Konstantin2009-09-251-0/+7032
| | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Update Russian translations for Qt Assistant and Qt Assistant_adp toolsRitt Konstantin2009-09-252-72/+52
| | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Update Russian translations for QtHelp libraryRitt Konstantin2009-09-251-44/+64
| | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Update Russian translations for Qt LinguistRitt Konstantin2009-09-251-22/+21
| | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Update Russian translations for QtConfigRitt Konstantin2009-09-251-19/+24
| | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Update Russian translations for QVFBRitt Konstantin2009-09-251-10/+11
| | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v0.12 at 2024-12-28 12:23:14 (GMT)