summaryrefslogtreecommitdiffstats
path: root/translations
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0711-0/+253
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits) fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. Allow empty authority in QUrl::setAuthority as per docs. Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority. fixed case of GL include directory check in MAC_APPLICATION_MENU translations Re-generate the Unicode tables after updates to the program that generates them Fix the code after merge: DerivedNormalizationProps has two or more columns add some usefull definitions to qunicodetables_p.h qchar.cpp: fix identation finish last commit prefer DerivedNormalizationProps.txt over CompositionExclusions.txt improve error reporting a bit more improve error reporting fix incorect condition check if string to int conversions were done w/o errors improve error reporting for unassigned grapheme/word/sentence break classes avoid using of qunicodetables_p.h in generator use QHash for line break map ...
| * check in MAC_APPLICATION_MENU translationsOswald Buddenhagen2010-03-0511-0/+253
| | | | | | | | | | | | | | these are stolen directly from mac and should not be altered. extracted from patch by Prasanth. Task-number: QTBUG-4463
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-067-1244/+2113
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * update russian translations and phrasebookRitt Konstantin2010-03-028-1363/+2229
| | | | | | | | | | Merge-request: 485 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | fix ts-assistant targetOswald Buddenhagen2010-02-251-1/+1
| |
* | Prepare German translations for 4.7 (except Quick).Friedemann Kleint2010-02-245-488/+1416
| |
* | Fixed URL in Russian translation.Robert Loehning2010-02-191-1/+1
| | | | | | | | Reviewed-by: hjk
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-151-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant: Rebuild search index at most once at start-up. Prepare translations of the declarative module.
| * | 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.6Thiago Macieira2010-02-121-4/+4
|\ \ \ | |/ / |/| / | |/
| * fix a few mistakes in German translationFrederik Schwarzer2010-02-091-4/+4
| | | | | | | | | | Merge-request: 2302 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-092-142/+436
|\ \ | |/ | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * I10n/German: Update translations for 4.6.2Friedemann Kleint2010-02-042-142/+436
| |
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-046-1/+20906
|\ \ | |/ | | | | | | | | | | | | | | 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-026-1/+20906
| | | | | | | | | | Merge-request: 440 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Move the Hungarian translation to the translations folderBenjamin Poulain2010-02-037-0/+22219
| |
* | 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-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
generated by cgit v0.12 at 2024-11-15 00:50:06 (GMT)