summaryrefslogtreecommitdiffstats
path: root/translations
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-181-0/+9800
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-161-0/+9800
| |\ | | | | | | | | | | | | Conflicts: src/gui/kernel/qwidget_s60.cpp
| | * Adding Persian translation of Qt.Soroush Rabiei2011-08-121-0/+9800
| | | | | | | | | | | | | | | Merge-request: 2640 Reviewed-by: ossi
* | | Russian translation updateSergey Belyashov2011-08-124-288/+687
| | | | | | | | | | | | | | | Merge-request: 1303 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Update Japanese translations for Qt 4.8.Takumi ASAKI2011-08-124-468/+640
|/ / | | | | | | | | Merge-request: 1315 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-177-179/+260
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| * \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-066-167/+260
| |\ \ | | |/
| | * Update Japanese translations.Takumi ASAKI2011-06-066-167/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix some inconsistent translations. * Translate some missing messages. * Update Japanese phrasebook. Merge-request: 1249 Reviewed-by: ossi
| | * Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
| | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-261-12/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: skip the ipv6 Host checking for the moment, since it fails on Windows XP. will fix later remove duplicate message fix "Host" header of ipv6 URLs in QNAM uic: Use QString::fromUtf8 for QUrl properties. uic: #include <QLayout> for QToolBox on non-laid-out forms. add test case for ipv6 url parsing
| | * | remove duplicate messageOswald Buddenhagen2011-05-261-12/+0
| | | | | | | | | | | | | | | | search and replace in a non-plaintext file. how intelligent.
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-243-26/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-182-9/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| | * \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-092-9/+5
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Ukrainian translation updatedVictor Ostashevsky2011-05-092-9/+5
| | | |
| * | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| |/ / | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Merge commit 'refs/merge-requests/1220' of git://gitorious.org/qt/qt into ↵David Boddie2011-05-051-0/+1
|\ \ \ | |/ / | | | | | | merge-requests/1220
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-041-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QmlViewer: Translate UI Fix insert and scroll to bottom case QDeclarativeDebug: Fix test case QDeclarativeDebug: Handle case where client with ongoing queries is deleted Remove compile warning Fix QUnifiedTimer bug Stop the animation driver when there are no more animations. Optimization and benchmark for setting object properties from QML. Add Constant and Final flags to QMetaObjectBuilder Fixed QML TextEdit docs Make -no-opengl exist on other platforms Only ask for name when the user goes on the high score list.
| | * | QmlViewer: Translate UIKai Koehne2011-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install translators for the Qt & QmlViewer translations. also add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated strings. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-14848
* | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-041-0/+34
|/ / / | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-2112-0/+21287
|\ \ \ | | |/ | |/| | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_ost/qostdevice.h
| * | remove exec bit ... again ...Oswald Buddenhagen2011-04-205-0/+0
| | |
| * | Add Korean translationPark Shinjo2011-04-207-0/+21287
| | | | | | | | | | | | | | | Merge-request: 1021 Reviewed-by: ossi
* | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-207-320/+458
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits) Fix compilation with symbian-armcc Updated Russian translation Ukrainian translation updated Fix wrong merge of 3aa39b0164ce4bb9e Symbol table is very limited in numeric input mode Fix build of Qt/DirectFB without graphics view support. Add new QSysInfo::symbianVersion() enums QDesktopServices::openUrl() doesn't handle URL encodings correctly Build fix for transition effect support on S60 5.0. Make EGL surface transparency working on Symbian. QmlDebug: Fix license headers in new ost plugin Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79 Resolve unqualified attached properties correctly Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian. QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp' QDeclarativeDebug: Don't crash when connection is closed Splitview flag should also be updated to inputcontext QGraphicsView with vertical scrollbar flickers when splitview opens Splitview: opening a context menu should not re-position of focusItem Trigger fullscreen transition effects properly on app exit. ...
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-207-320/+458
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Updated Russian translationSergey Belyashov2011-04-194-319/+366
| | | | | | | | | | | | | | | Merge-request: 2596 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Ukrainian translation updatedVictor Ostashevsky2011-04-193-1/+92
| | | | | | | | | | | | | | | Merge-request: 1189 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | L10n: German translations for Qt 4.8Friedemann Kleint2011-04-143-26/+258
|/ /
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-079-1028/+1792
|\ \ | |/ | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * Update Polish translationsJarek Kobus2011-03-297-1025/+1717
| | | | | | | | Reviewed-by: Pawel Polanski <pawel.3.polanski@nokia.com>
| * L10n: Update German translations.Friedemann Kleint2011-03-292-3/+75
| |
* | absorb translations.pri into translations.proOswald Buddenhagen2011-03-312-81/+81
| | | | | | | | | | this moves the various ts targets into the translations/ directory. creator and mobility already employ this scheme.
* | Update copyright year to 2011.Rohan McGovern2011-03-108-11/+11
| | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-2520-5686/+5925
|\ \ | |/ | | | | | | | | Conflicts: configure src/network/bearer/bearer.pri
| * Update of Czech translation for Qt 4.7-stablePavel Fric2011-01-245-4225/+4148
| | | | | | | | | | Merge-request: 2553 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Updates to Galician localizationmarce villarino2011-01-172-1362/+1678
| | | | | | | | | | Merge-request: 1024 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * German translation fixesFrederik Schwarzer2011-01-171-86/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | - some entity mismatches (apos -> quot) - Boolesch -> boolesch - Hangul is translated Hangeul - schlug fehl -> ist fehlgeschlagen - unify: next; previous -> nächte[sr]; vorherige[sr] - unify: Encoding -> Kodierung ... and some various fixes more. Merge-request: 2535 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * fix typo in error messagesOswald Buddenhagen2011-01-1714-14/+14
| | | | | | | | Task-number: QTBUG-16369
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1751-80/+80
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1051-80/+80
| | | | | | | | Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-056-162/+1933
|\ \ | |/ | | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * Russian translation updateSergey Belyashov2010-11-046-162/+1933
| | | | | | | | | | Merge-request: 895 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-032-7/+34
|\ \ | |/
| * german translation: minor additions + fixesFrederik Schwarzer2010-11-022-7/+34
| | | | | | | | | | Merge-request: 902 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-254-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * fix a translation bug in qt_zh_CN.tsliang jian2010-10-201-1/+1
| | | | | | | | | | Merge-request: 858 Reviewed-by: Liang Qi <liang.qi@nokia.com>
| * remove exec bits again ...Oswald Buddenhagen2010-10-113-0/+0
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-076-661/+1952
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| * Update japanese translations.axasia2010-10-046-661/+1952
| | | | | | | | | | Merge-request: 837 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-043-9/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
generated by cgit v0.12 at 2025-01-02 21:46:20 (GMT)